Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Weyland-Yutani Intranet Terminal #7511

Open
wants to merge 21 commits into
base: master
Choose a base branch
from
Open

Weyland-Yutani Intranet Terminal #7511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
47a1d0d
start
realforest2001 Oct 26, 2024
0b1b98a
Merge remote-tracking branch 'cmss13-devs/master' into forest/liaison
realforest2001 Nov 5, 2024
a7f2e5a
Intranet Console
realforest2001 Nov 6, 2024
127a76f
oversight
realforest2001 Nov 6, 2024
a7a33dd
Merge remote-tracking branch 'cmss13-devs/master' into forest/liaison
realforest2001 Nov 7, 2024
89f3bc9
biometrics
realforest2001 Nov 7, 2024
4e96d59
Merge remote-tracking branch 'cmss13-devs/master' into forest/liaison
realforest2001 Nov 11, 2024
130208f
map reset
realforest2001 Nov 11, 2024
b2b47d3
WHY IS RESETTING CHANGES A FUCKING BITCH EVERY SINGLE TIME
realforest2001 Nov 11, 2024
1eae950
FU
realforest2001 Nov 11, 2024
164319a
mapping
realforest2001 Nov 11, 2024
f378fb3
Merge remote-tracking branch 'cmss13-devs/master' into forest/liaison
realforest2001 Nov 14, 2024
3b22ecb
vent fix
realforest2001 Nov 14, 2024
03a505d
Update tgui/packages/tgui/interfaces/WYComputer.jsx
realforest2001 Nov 15, 2024
1e7ab38
format
realforest2001 Nov 16, 2024
df2219b
confirm buttons
realforest2001 Nov 16, 2024
f21aaa9
Merge remote-tracking branch 'cmss13-devs/master' into forest/liaison
realforest2001 Nov 24, 2024
0e4e01f
tags
realforest2001 Nov 24, 2024
75725cb
Fixup maps in TGM format
realforest2001 Nov 27, 2024
66b4590
Merge remote-tracking branch 'cmss13-devs/master' into forest/liaison
realforest2001 Nov 27, 2024
029c427
Fixup maps in TGM format
realforest2001 Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions code/__DEFINES/ARES.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,3 +82,5 @@

/// Time until someone can respawn as Working Joe
#define JOE_JOIN_DEAD_TIME (15 MINUTES)

GLOBAL_LIST_EMPTY_TYPED(gas_vents, /obj/structure/pipes/vents/pump/no_boom/gas)
1 change: 1 addition & 0 deletions code/__DEFINES/objects.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ GLOBAL_LIST_INIT(RESTRICTED_CAMERA_NETWORKS, list( //Those networks can only be
CAMERA_NET_COLONY,
CAMERA_NET_OVERWATCH,
CAMERA_NET_ARES,
CAMERA_NET_CONTAINMENT_HIDDEN,
))

#define STASIS_IN_BAG 1
Expand Down
16 changes: 16 additions & 0 deletions code/__DEFINES/wycomputer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/// WY Corporate Director
#define WY_COMP_ACCESS_DIRECTOR 7
/// WY Corporate Leadership (Chief Exec and Div Manager)
#define WY_COMP_ACCESS_SENIOR_LEAD 6
/// WY Corporate Supervisors (Asst. Manager and Exec. Supervisor)
#define WY_COMP_ACCESS_SUPERVISOR 5
/// WY Senior Employees (Exec. Specialists and Senior Execs.)
#define WY_COMP_ACCESS_CORPORATE_SENIOR 4
/// WY Corporate Liaison
#define WY_COMP_ACCESS_LIAISON 3
/// WY Corporate Employees
#define WY_COMP_ACCESS_CORPORATE 2
/// Unauthenticated Personnel
#define WY_COMP_ACCESS_FORBIDDEN 1
/// Logged out...
#define WY_COMP_ACCESS_LOGGED_OUT 0
2 changes: 1 addition & 1 deletion code/game/machinery/ARES/ARES_interface.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@

if("trigger_vent")
playsound = FALSE
var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
var/obj/structure/pipes/vents/pump/no_boom/gas/ares/sec_vent = locate(params["vent"])
if(!istype(sec_vent) || sec_vent.welded)
to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/ARES/ARES_interface_admin.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@
return TRUE

if("trigger_vent")
var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
var/obj/structure/pipes/vents/pump/no_boom/gas/ares/sec_vent = locate(params["vent"])
if(!istype(sec_vent) || sec_vent.welded)
to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/ARES/ARES_interface_apollo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,7 +420,7 @@

if("trigger_vent")
playsound = FALSE
var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
var/obj/structure/pipes/vents/pump/no_boom/gas/ares/sec_vent = locate(params["vent"])
if(!istype(sec_vent) || sec_vent.welded)
to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/ARES/ARES_procs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
/datum/ares_link/proc/get_ares_vents()
var/list/security_vents = list()
var/datum/ares_link/link = GLOB.ares_link
for(var/obj/structure/pipes/vents/pump/no_boom/gas/vent in link.linked_vents)
for(var/obj/structure/pipes/vents/pump/no_boom/gas/ares/vent in link.linked_vents)
if(!vent.vent_tag)
vent.vent_tag = "Security Vent #[link.tag_num]"
link.tag_num++
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/ARES/apollo_pda.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@

if("trigger_vent")
playsound = FALSE
var/obj/structure/pipes/vents/pump/no_boom/gas/sec_vent = locate(params["vent"])
var/obj/structure/pipes/vents/pump/no_boom/gas/ares/sec_vent = locate(params["vent"])
if(!istype(sec_vent) || sec_vent.welded)
to_chat(user, SPAN_WARNING("ERROR: Gas release failure."))
playsound(src, 'sound/machines/buzz-two.ogg', 15, 1)
Expand Down
Loading