Merge pull request #4315 from Citadel-Station-13/upstream-merge-33152

[MIRROR] Airlock Construction Update

code/modules/mining/equipment/survival_pod.dm

@@ -94,38 +94,19 @@
 	name = "airlock"
 	icon = 'icons/obj/doors/airlocks/survival/survival.dmi'
 	overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
-	note_overlay_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
 	assemblytype = /obj/structure/door_assembly/door_assembly_pod
+
+/obj/machinery/door/airlock/survival_pod/glass
 	opacity = FALSE
 	glass = TRUE
-	var/expected_dir = SOUTH //we visually turn when shuttle rotated, but need to not turn for any other reason
-
-/obj/machinery/door/airlock/survival_pod/setDir(direction)
-	direction = expected_dir
-	..()
-
-/obj/machinery/door/airlock/survival_pod/vertical
-	dir = EAST
-	expected_dir = EAST
 
 /obj/structure/door_assembly/door_assembly_pod
 	name = "pod airlock assembly"
 	icon = 'icons/obj/doors/airlocks/survival/survival.dmi'
+	base_name = "pod airlock"
 	overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi'
 	airlock_type = /obj/machinery/door/airlock/survival_pod
-	anchored = TRUE
-	state = 1
-	mineral = "glass"
-	material = "glass"
-	var/expected_dir = SOUTH
-
-/obj/structure/door_assembly/door_assembly_pod/setDir(direction)
-	direction = expected_dir
-	..()
-
-/obj/structure/door_assembly/door_assembly_pod/vertical
-	dir = EAST
-	expected_dir = EAST
+	glass_type = /obj/machinery/door/airlock/survival_pod/glass
 
 //Windoor
 /obj/machinery/door/window/survival_pod

code/modules/shuttle/shuttle_rotate.dm

@@ -48,10 +48,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
 
 /************************************Structure rotate procs************************************/
 
-/obj/structure/door_assembly/door_assembly_pod/shuttleRotate(rotation, params)
-	. = ..()
-	expected_dir = angle2dir(rotation+dir2angle(dir))
-
 /obj/structure/cable/shuttleRotate(rotation, params)
 	params &= ~ROTATE_DIR
 	. = ..()
@@ -105,10 +101,6 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
 	params = NONE
 	return ..()
 
-/obj/machinery/door/airlock/survival_pod/shuttleRotate(rotation, params)
-	expected_dir = angle2dir(rotation+dir2angle(dir))
-	return ..()
-
 //prevents shuttles attempting to rotate this since it messes up sprites
 /obj/machinery/gravity_generator/shuttleRotate(rotation, params)
 	params = NONE