TGS Test Merge (#7511)

cmss13-devs · Jan 8, 2025 · 9015c92 · 9015c92
2 parents e60426b + babe07f
commit 9015c92
Show file tree

Hide file tree

Showing 15 changed files with 848 additions and 63 deletions.
diff --git a/code/__DEFINES/ARES.dm b/code/__DEFINES/ARES.dm
@@ -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)
diff --git a/code/__DEFINES/objects.dm b/code/__DEFINES/objects.dm
@@ -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

diff --git a/code/__DEFINES/wycomputer.dm b/code/__DEFINES/wycomputer.dm
@@ -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
diff --git a/code/game/machinery/ARES/ARES_interface.dm b/code/game/machinery/ARES/ARES_interface.dm
@@ -452,7 +452,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)

diff --git a/code/game/machinery/ARES/ARES_interface_admin.dm b/code/game/machinery/ARES/ARES_interface_admin.dm
@@ -342,7 +342,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)

diff --git a/code/game/machinery/ARES/ARES_interface_apollo.dm b/code/game/machinery/ARES/ARES_interface_apollo.dm
@@ -359,7 +359,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)

diff --git a/code/game/machinery/ARES/ARES_interface_data.dm b/code/game/machinery/ARES/ARES_interface_data.dm
@@ -133,7 +133,7 @@
 	data["records_discussions"] = logged_convos
 
 	var/list/security_vents = list()
-	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++

diff --git a/code/game/machinery/ARES/ARES_procs.dm b/code/game/machinery/ARES/ARES_procs.dm
@@ -54,7 +54,6 @@ GLOBAL_LIST_INIT(maintenance_categories, list(
 		alert.delink()
 	..()
 
-
 /* BELOW ARE IN AdminAres.dm
 /datum/ares_link/tgui_interact(mob/user, datum/tgui/ui)
 /datum/ares_link/ui_data(mob/user)

diff --git a/code/game/machinery/ARES/apollo_pda.dm b/code/game/machinery/ARES/apollo_pda.dm
@@ -390,7 +390,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)
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)