diff --git a/code/modules/mining/mine_items.dm b/code/modules/mining/mine_items.dm index d15896a8db..3df4d521ff 100644 --- a/code/modules/mining/mine_items.dm +++ b/code/modules/mining/mine_items.dm @@ -300,31 +300,47 @@ //Door /obj/machinery/door/airlock/survival_pod name = "airlock" - icon = 'icons/obj/doors/airlocks/survival/horizontal/survival.dmi' - overlays_file = 'icons/obj/doors/airlocks/survival/horizontal/survival_overlays.dmi' + icon = 'icons/obj/doors/airlocks/survival/survival.dmi' + overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_pod opacity = 0 glass = 1 + 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/shuttleRotate(rotation) + expected_dir = angle2dir(rotation+dir2angle(dir)) + ..() /obj/machinery/door/airlock/survival_pod/vertical - icon = 'icons/obj/doors/airlocks/survival/vertical/survival.dmi' - overlays_file = 'icons/obj/doors/airlocks/survival/vertical/survival_overlays.dmi' - assemblytype = /obj/structure/door_assembly/door_assembly_pod/vertical + dir = EAST + expected_dir = EAST /obj/structure/door_assembly/door_assembly_pod name = "pod airlock assembly" - icon = 'icons/obj/doors/airlocks/survival/horizontal/survival.dmi' - overlays_file = 'icons/obj/doors/airlocks/survival/horizontal/survival_overlays.dmi' + icon = 'icons/obj/doors/airlocks/survival/survival.dmi' + overlays_file = 'icons/obj/doors/airlocks/survival/survival_overlays.dmi' airlock_type = /obj/machinery/door/airlock/survival_pod anchored = 1 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/shuttleRotate(rotation) + expected_dir = angle2dir(rotation+dir2angle(dir)) + ..() /obj/structure/door_assembly/door_assembly_pod/vertical - icon = 'icons/obj/doors/airlocks/survival/vertical/survival.dmi' - overlays_file = 'icons/obj/doors/airlocks/survival/vertical/survival_overlays.dmi' - airlock_type = /obj/machinery/door/airlock/survival_pod/vertical + dir = EAST + expected_dir = EAST //Table /obj/structure/table/survival_pod diff --git a/icons/obj/doors/airlocks/survival/horizontal/survival.dmi b/icons/obj/doors/airlocks/survival/horizontal/survival.dmi deleted file mode 100644 index 5dbe3de771..0000000000 Binary files a/icons/obj/doors/airlocks/survival/horizontal/survival.dmi and /dev/null differ diff --git a/icons/obj/doors/airlocks/survival/horizontal/survival_overlays.dmi b/icons/obj/doors/airlocks/survival/horizontal/survival_overlays.dmi deleted file mode 100644 index 9bdb3be3cd..0000000000 Binary files a/icons/obj/doors/airlocks/survival/horizontal/survival_overlays.dmi and /dev/null differ diff --git a/icons/obj/doors/airlocks/survival/survival.dmi b/icons/obj/doors/airlocks/survival/survival.dmi new file mode 100644 index 0000000000..f96d174c47 Binary files /dev/null and b/icons/obj/doors/airlocks/survival/survival.dmi differ diff --git a/icons/obj/doors/airlocks/survival/survival_overlays.dmi b/icons/obj/doors/airlocks/survival/survival_overlays.dmi new file mode 100644 index 0000000000..e8bede8217 Binary files /dev/null and b/icons/obj/doors/airlocks/survival/survival_overlays.dmi differ diff --git a/icons/obj/doors/airlocks/survival/vertical/survival.dmi b/icons/obj/doors/airlocks/survival/vertical/survival.dmi deleted file mode 100644 index c5063da5a0..0000000000 Binary files a/icons/obj/doors/airlocks/survival/vertical/survival.dmi and /dev/null differ diff --git a/icons/obj/doors/airlocks/survival/vertical/survival_overlays.dmi b/icons/obj/doors/airlocks/survival/vertical/survival_overlays.dmi deleted file mode 100644 index 26d0c0d403..0000000000 Binary files a/icons/obj/doors/airlocks/survival/vertical/survival_overlays.dmi and /dev/null differ