TGS Test Merge (#5817)

Temporary infinite loop fix when equipping dropship equipment
cmss13-devs · Feb 26, 2024 · 7e2d1b6 · 7e2d1b6
2 parents 48bafdb + fdbe53d
commit 7e2d1b6
Show file tree

Hide file tree

Showing 22 changed files with 312 additions and 363 deletions.
diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm
@@ -569,3 +569,4 @@
 	icon = 'icons/obj/structures/doors/2x1almayerdoor_glass.dmi'
 	opacity = FALSE
 	glass = TRUE
+
diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm
@@ -21,10 +21,6 @@
 	var/skill_required = SKILL_PILOT_TRAINED
 	var/combat_equipment = TRUE
 
-/obj/structure/dropship_equipment/Initialize()
-	. = ..()
-	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))
-
 /obj/structure/dropship_equipment/Destroy()
 	QDEL_NULL(ammo_equipped)
 	if(linked_shuttle)
@@ -37,15 +33,8 @@
 		if(linked_console.selected_equipment && linked_console.selected_equipment == src)
 			linked_console.selected_equipment = null
 		linked_console = null
-	UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
 	. = ..()
 
-/obj/structure/dropship_equipment/proc/on_dir_change(datum/source, old_dir, new_dir)
-	SIGNAL_HANDLER
-	if(old_dir == new_dir)
-		return
-	update_equipment()
-
 /obj/structure/dropship_equipment/attack_alien(mob/living/carbon/xenomorph/current_xenomorph)
 	if(unslashable)
 		return XENO_NO_DELAY_ACTION

diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm
@@ -81,12 +81,10 @@
 					door_control.add_door(air, "port")
 				if("aft_door")
 					door_control.add_door(air, "aft")
-	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))
 
 /obj/docking_port/mobile/marine_dropship/Destroy(force)
 	. = ..()
 	qdel(door_control)
-	UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
 
 /obj/docking_port/mobile/marine_dropship/proc/control_doors(action, direction, force, asynchronous = TRUE)
 	// its been locked down by the queen
@@ -120,12 +118,6 @@
 			set_security_level(SEC_LEVEL_RED)
 			return
 
-/obj/docking_port/mobile/marine_dropship/proc/on_dir_change(datum/source, old_dir, new_dir)
-	SIGNAL_HANDLER
-	for(var/place in shuttle_areas)
-		for(var/obj/structure/machinery/door/air in place)
-			air.handle_multidoor(old_dir, new_dir)
-
 /obj/docking_port/mobile/marine_dropship/alamo
 	name = "Alamo"
 	id = DROPSHIP_ALAMO

diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm
@@ -31,11 +31,9 @@
 			air.breakable = FALSE
 			air.indestructible = TRUE
 			air.unacidable = TRUE
-	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(on_dir_change))
 
 /obj/docking_port/mobile/emergency_response/enterTransit()
 	control_doors("force-lock-launch", force = TRUE, external_only = TRUE)
-	UnregisterSignal(src, COMSIG_ATOM_DIR_CHANGE)
 	..()
 
 /obj/docking_port/mobile/emergency_response/proc/control_doors(action, force = FALSE, external_only = FALSE)
@@ -79,10 +77,10 @@
 	air.lock()
 	air.safe = 1
 
-/obj/docking_port/mobile/emergency_response/proc/on_dir_change(datum/source, old_dir, new_dir)
-	SIGNAL_HANDLER
+/obj/docking_port/mobile/emergency_response/setDir(newdir)
+	. = ..()
 	for(var/obj/structure/machinery/door/shuttle_door in doors)
-		shuttle_door.handle_multidoor(old_dir, new_dir)
+		shuttle_door.handle_multidoor()
 
 // ERT Shuttle 1
 /obj/docking_port/mobile/emergency_response/ert1

diff --git a/icons/obj/structures/doors/dropship1_cargo.dmi b/icons/obj/structures/doors/dropship1_cargo.dmi
diff --git a/icons/obj/structures/doors/dropship1_pilot.dmi b/icons/obj/structures/doors/dropship1_pilot.dmi
diff --git a/icons/obj/structures/doors/dropship1_side.dmi b/icons/obj/structures/doors/dropship1_side.dmi
diff --git a/icons/obj/structures/doors/dropship2_cargo.dmi b/icons/obj/structures/doors/dropship2_cargo.dmi
diff --git a/icons/obj/structures/doors/dropship2_pilot.dmi b/icons/obj/structures/doors/dropship2_pilot.dmi
diff --git a/icons/obj/structures/doors/dropship2_side.dmi b/icons/obj/structures/doors/dropship2_side.dmi
diff --git a/icons/obj/structures/props/almayer_props64.dmi b/icons/obj/structures/props/almayer_props64.dmi
diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi
diff --git a/icons/turf/dropship2.dmi b/icons/turf/dropship2.dmi
diff --git a/icons/turf/ert_shuttle.dmi b/icons/turf/ert_shuttle.dmi
diff --git a/icons/turf/escapepods.dmi b/icons/turf/escapepods.dmi
diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm
@@ -18,6 +18,14 @@
 /obj/structure/shuttle/part/dropship1/transparent/nose_center,
 /turf/template_noop,
 /area/shuttle/drop1/sulaco)
+"bc" = (
+/obj/effect/attach_point/electronics/dropship1{
+	dir = 1;
+	attach_id = 5
+	},
+/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons,
+/turf/template_noop,
+/area/shuttle/drop1/sulaco)
 "be" = (
 /obj/structure/shuttle/part/dropship1/transparent/upper_right_wing,
 /turf/template_noop,
@@ -73,6 +81,15 @@
 	icon_state = "floor8"
 	},
 /area/shuttle/drop1/sulaco)
+"ed" = (
+/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
+	dir = 1;
+	id = "starboard_door"
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
+	},
+/area/shuttle/drop1/sulaco)
 "eD" = (
 /obj/structure/shuttle/part/dropship1/transparent/engine_right_cap,
 /turf/template_noop,
@@ -212,6 +229,14 @@
 /obj/structure/shuttle/part/dropship1/transparent/left_outer_bottom_wing,
 /turf/template_noop,
 /area/shuttle/drop1/sulaco)
+"sm" = (
+/obj/effect/attach_point/fuel/dropship1{
+	attach_id = 10
+	},
+/turf/closed/shuttle/dropship1/transparent{
+	icon_state = "28"
+	},
+/area/shuttle/drop1/sulaco)
 "sA" = (
 /obj/structure/shuttle/part/dropship1/lower_left_wall,
 /turf/template_noop,
@@ -294,14 +319,6 @@
 	icon_state = "63"
 	},
 /area/shuttle/drop1/sulaco)
-"BM" = (
-/obj/effect/attach_point/crew_weapon/dropship1/floor{
-	attach_id = 9
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/shuttle/drop1/sulaco)
 "BS" = (
 /turf/closed/shuttle/dropship1{
 	icon_state = "48"
@@ -352,15 +369,6 @@
 	icon_state = "39"
 	},
 /area/shuttle/drop1/sulaco)
-"GQ" = (
-/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
-	dir = 1;
-	id = "starboard_door"
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
-	},
-/area/shuttle/drop1/sulaco)
 "Ho" = (
 /obj/structure/machinery/computer/dropship_weapons/dropship1,
 /obj/structure/transmitter/rotary{
@@ -393,23 +401,6 @@
 	icon_state = "35"
 	},
 /area/shuttle/drop1/sulaco)
-"Iu" = (
-/obj/effect/attach_point/fuel/dropship1{
-	dir = 1;
-	pixel_x = -32
-	},
-/turf/closed/shuttle/dropship1/transparent{
-	icon_state = "33"
-	},
-/area/shuttle/drop1/sulaco)
-"IP" = (
-/obj/effect/attach_point/electronics/dropship1{
-	dir = 1;
-	attach_id = 6
-	},
-/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons,
-/turf/template_noop,
-/area/shuttle/drop1/sulaco)
 "Jb" = (
 /turf/closed/shuttle/dropship1/transparent{
 	icon_state = "80"
@@ -424,10 +415,16 @@
 	icon_state = "62"
 	},
 /area/shuttle/drop1/sulaco)
-"Kt" = (
-/obj/structure/machinery/door/airlock/hatch/cockpit{
-	dir = 1
+"Kk" = (
+/obj/effect/attach_point/crew_weapon/dropship1/floor{
+	attach_id = 7
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
 	},
+/area/shuttle/drop1/sulaco)
+"KC" = (
+/obj/structure/machinery/door/airlock/hatch/cockpit,
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -452,6 +449,23 @@
 	icon_state = "64"
 	},
 /area/shuttle/drop1/sulaco)
+"Nv" = (
+/obj/effect/attach_point/crew_weapon/dropship1/floor{
+	attach_id = 8
+	},
+/turf/open/shuttle/dropship{
+	icon_state = "rasputin15"
+	},
+/area/shuttle/drop1/sulaco)
+"ND" = (
+/obj/effect/attach_point/fuel/dropship1{
+	pixel_x = -32;
+	attach_id = 11
+	},
+/turf/closed/shuttle/dropship1/transparent{
+	icon_state = "33"
+	},
+/area/shuttle/drop1/sulaco)
 "NQ" = (
 /obj/structure/shuttle/part/dropship1/transparent/left_inner_bottom_wing,
 /turf/template_noop,
@@ -492,9 +506,9 @@
 	icon_state = "rasputin15"
 	},
 /area/shuttle/drop1/sulaco)
-"PA" = (
+"PV" = (
 /obj/effect/attach_point/crew_weapon/dropship1/floor{
-	attach_id = 7
+	attach_id = 9
 	},
 /turf/open/shuttle/dropship{
 	icon_state = "rasputin15"
@@ -584,14 +598,6 @@
 	icon_state = "rasputin15"
 	},
 /area/shuttle/drop1/sulaco)
-"UN" = (
-/obj/effect/attach_point/electronics/dropship1{
-	dir = 1;
-	attach_id = 5
-	},
-/obj/structure/shuttle/part/dropship1/transparent/inner_left_weapons,
-/turf/template_noop,
-/area/shuttle/drop1/sulaco)
 "Vm" = (
 /turf/closed/shuttle/dropship1/transparent{
 	icon_state = "78"
@@ -628,15 +634,7 @@
 	icon_state = "rasputin7"
 	},
 /area/shuttle/drop1/sulaco)
-"XH" = (
-/obj/effect/attach_point/fuel/dropship1{
-	dir = 1
-	},
-/turf/closed/shuttle/dropship1/transparent{
-	icon_state = "28"
-	},
-/area/shuttle/drop1/sulaco)
-"XI" = (
+"XP" = (
 /obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds1{
 	id = "port_door";
 	dir = 2
@@ -645,13 +643,13 @@
 	icon_state = "rasputin15"
 	},
 /area/shuttle/drop1/sulaco)
-"YV" = (
-/obj/effect/attach_point/crew_weapon/dropship1/floor{
-	attach_id = 8
-	},
-/turf/open/shuttle/dropship{
-	icon_state = "rasputin15"
+"Ye" = (
+/obj/effect/attach_point/electronics/dropship1{
+	dir = 1;
+	attach_id = 6
 	},
+/obj/structure/shuttle/part/dropship1/transparent/inner_right_weapons,
+/turf/template_noop,
 /area/shuttle/drop1/sulaco)
 "Za" = (
 /turf/closed/shuttle/dropship1{
@@ -685,7 +683,7 @@ mb
 mb
 FA
 Oq
-XH
+sm
 iz
 EN
 mb
@@ -702,7 +700,7 @@ Et
 iI
 JP
 il
-XI
+XP
 mW
 qn
 sA
@@ -719,7 +717,7 @@ NQ
 mb
 mb
 mb
-UN
+bc
 oo
 TK
 ws
@@ -789,7 +787,7 @@ ax
 EB
 Py
 tR
-Kt
+KC
 dU
 Ph
 BB
@@ -798,11 +796,11 @@ BB
 OK
 OU
 il
-PA
+Kk
 il
-YV
+Nv
 il
-BM
+PV
 il
 mb
 mb
@@ -857,7 +855,7 @@ Wg
 mb
 mb
 mb
-IP
+Ye
 oo
 TK
 cr
@@ -886,7 +884,7 @@ iv
 zV
 MP
 il
-GQ
+ed
 nC
 nE
 rl
@@ -915,7 +913,7 @@ mb
 mb
 eD
 Gw
-Iu
+ND
 qy
 Jm
 mb