reoriented sprites and door rotate into signal handler

cmss13-devs · Jul 29, 2023 · 5059ca2 · 5059ca2
1 parent 6ba1877
commit 5059ca2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/code/modules/shuttle/shuttles/dropship.dm b/code/modules/shuttle/shuttles/dropship.dm
@@ -63,10 +63,12 @@
 					door_control.add_door(air, "port")
 				if("aft_door")
 					door_control.add_door(air, "aft")
+	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(handle_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
@@ -81,13 +83,21 @@
 	. = ..()
 	control_doors("force-lock-launch", "all", force=TRUE, asynchronous = FALSE)
 
+/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()
+
 /obj/docking_port/mobile/marine_dropship/alamo
 	name = "Alamo"
 	id = DROPSHIP_ALAMO
+	preferred_direction = WEST
 
 /obj/docking_port/mobile/marine_dropship/normandy
 	name = "Normandy"
 	id = DROPSHIP_NORMANDY
+	preferred_direction = EAST
 
 /obj/docking_port/mobile/marine_dropship/check()
 	. = ..()

diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm
@@ -31,9 +31,11 @@
 			air.breakable = FALSE
 			air.indestructible = TRUE
 			air.unacidable = TRUE
+	RegisterSignal(src, COMSIG_ATOM_DIR_CHANGE, PROC_REF(handle_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)
@@ -78,8 +80,8 @@
 	air.lock()
 	air.safe = 1
 
-/obj/docking_port/mobile/emergency_response/setDir(newdir)
-	. = ..()
+/obj/docking_port/mobile/emergency_response/proc/on_dir_change(datum/source, old_dir, new_dir)
+	SIGNAL_HANDLER
 	for(var/obj/structure/machinery/door/shuttle_door in doors)
 		shuttle_door.handle_multidoor()
 

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/dropship2_cargo.dmi b/icons/obj/structures/doors/dropship2_cargo.dmi
diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm
@@ -472,7 +472,8 @@
 /obj/structure/machinery/door/airlock/hatch/cockpit{
 	req_access = null;
 	req_access_txt = "22";
-	req_one_access = null
+	req_one_access = null;
+	dir = 1
 	},
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/shuttle/dropship{

diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm
@@ -696,7 +696,8 @@
 /obj/structure/machinery/door/airlock/hatch/cockpit/two{
 	req_access = null;
 	req_access_txt = "22";
-	req_one_access = null
+	req_one_access = null;
+	dir = 1
 	},
 /obj/structure/blocker/forcefield/multitile_vehicles,
 /turf/open/shuttle/dropship{