diff --git a/code/game/machinery/doors/multi_tile.dm b/code/game/machinery/doors/multi_tile.dm index ed2874fc3505..f943cd696897 100644 --- 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 index cd3c01459b7b..b162fb7c6a87 100644 --- 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 index 557e443f08a2..ce9ba7c623bb 100644 --- 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 index cc6e61f7a26a..4c078f3fe6d3 100644 --- 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 index be517592324f..699a3cc13b9f 100644 Binary files a/icons/obj/structures/doors/dropship1_cargo.dmi and b/icons/obj/structures/doors/dropship1_cargo.dmi differ diff --git a/icons/obj/structures/doors/dropship1_pilot.dmi b/icons/obj/structures/doors/dropship1_pilot.dmi index 0ae55add9966..776882a136e4 100644 Binary files a/icons/obj/structures/doors/dropship1_pilot.dmi and b/icons/obj/structures/doors/dropship1_pilot.dmi differ diff --git a/icons/obj/structures/doors/dropship1_side.dmi b/icons/obj/structures/doors/dropship1_side.dmi index 7f3298d69975..346811438914 100644 Binary files a/icons/obj/structures/doors/dropship1_side.dmi and b/icons/obj/structures/doors/dropship1_side.dmi differ diff --git a/icons/obj/structures/doors/dropship2_cargo.dmi b/icons/obj/structures/doors/dropship2_cargo.dmi index f6bd23184889..4e2ebfe0e3d2 100644 Binary files a/icons/obj/structures/doors/dropship2_cargo.dmi and b/icons/obj/structures/doors/dropship2_cargo.dmi differ diff --git a/icons/obj/structures/doors/dropship2_pilot.dmi b/icons/obj/structures/doors/dropship2_pilot.dmi index 226249be4d84..9a77adf39f70 100644 Binary files a/icons/obj/structures/doors/dropship2_pilot.dmi and b/icons/obj/structures/doors/dropship2_pilot.dmi differ diff --git a/icons/obj/structures/doors/dropship2_side.dmi b/icons/obj/structures/doors/dropship2_side.dmi index 8dfa437d6521..03c0492d7df9 100644 Binary files a/icons/obj/structures/doors/dropship2_side.dmi and b/icons/obj/structures/doors/dropship2_side.dmi differ diff --git a/icons/obj/structures/props/almayer_props64.dmi b/icons/obj/structures/props/almayer_props64.dmi index f47f19be9081..c45b37d6ef15 100644 Binary files a/icons/obj/structures/props/almayer_props64.dmi and b/icons/obj/structures/props/almayer_props64.dmi differ diff --git a/icons/turf/dropship.dmi b/icons/turf/dropship.dmi index e4261344ebba..b3cf56eb4549 100644 Binary files a/icons/turf/dropship.dmi and b/icons/turf/dropship.dmi differ diff --git a/icons/turf/dropship2.dmi b/icons/turf/dropship2.dmi index 53a44fe75b71..754c20d9ead4 100644 Binary files a/icons/turf/dropship2.dmi and b/icons/turf/dropship2.dmi differ diff --git a/icons/turf/ert_shuttle.dmi b/icons/turf/ert_shuttle.dmi index 39018d4f1611..befed9f547b7 100644 Binary files a/icons/turf/ert_shuttle.dmi and b/icons/turf/ert_shuttle.dmi differ diff --git a/icons/turf/escapepods.dmi b/icons/turf/escapepods.dmi index 96aa67789bb1..089db3cd3e19 100644 Binary files a/icons/turf/escapepods.dmi and b/icons/turf/escapepods.dmi differ diff --git a/maps/shuttles/dropship_alamo.dmm b/maps/shuttles/dropship_alamo.dmm index dd799ca7cd6e..7ea59dbb1185 100644 --- 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 diff --git a/maps/shuttles/dropship_normandy.dmm b/maps/shuttles/dropship_normandy.dmm index 969e5927d3f8..0cf629e638e1 100644 --- a/maps/shuttles/dropship_normandy.dmm +++ b/maps/shuttles/dropship_normandy.dmm @@ -15,16 +15,6 @@ icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) -"ba" = ( -/obj/effect/attach_point/fuel/dropship2{ - dir = 1; - pixel_x = -32; - attach_id = 11 - }, -/turf/closed/shuttle/dropship2/transparent{ - icon_state = "33" - }, -/area/shuttle/drop2/sulaco) "bc" = ( /obj/structure/shuttle/part/dropship2/transparent/left_outer_bottom_wing, /turf/template_noop, @@ -46,14 +36,6 @@ /obj/structure/shuttle/part/dropship2/transparent/right_outer_bottom_wing, /turf/template_noop, /area/shuttle/drop2/sulaco) -"db" = ( -/obj/effect/attach_point/crew_weapon/dropship2/floor{ - attach_id = 7 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/shuttle/drop2/sulaco) "eu" = ( /turf/closed/shuttle/dropship2{ icon_state = "75" @@ -69,14 +51,6 @@ icon_state = "29" }, /area/shuttle/drop2/sulaco) -"ft" = ( -/obj/effect/attach_point/crew_weapon/dropship2/floor{ - attach_id = 8 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin3" - }, -/area/shuttle/drop2/sulaco) "fx" = ( /turf/closed/shuttle/dropship2{ icon_state = "69" @@ -105,6 +79,14 @@ icon_state = "54" }, /area/shuttle/drop2/sulaco) +"gH" = ( +/obj/effect/attach_point/electronics/dropship2{ + dir = 1; + attach_id = 6 + }, +/obj/structure/shuttle/part/dropship2/transparent/inner_right_weapons, +/turf/template_noop, +/area/shuttle/drop2/sulaco) "gP" = ( /obj/structure/bed/chair/dropship/pilot{ dir = 1 @@ -113,22 +95,12 @@ icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) -"gV" = ( -/obj/effect/attach_point/fuel/dropship2{ - dir = 1; - attach_id = 10 - }, -/turf/closed/shuttle/dropship2/transparent{ - icon_state = "28" - }, -/area/shuttle/drop2/sulaco) -"he" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - dir = 1; - id = "starboard_door" +"hn" = ( +/obj/effect/attach_point/crew_weapon/dropship2/floor{ + attach_id = 8 }, /turf/open/shuttle/dropship{ - icon_state = "rasputin15" + icon_state = "rasputin3" }, /area/shuttle/drop2/sulaco) "it" = ( @@ -179,15 +151,6 @@ icon_state = "26" }, /area/shuttle/drop2/sulaco) -"lj" = ( -/obj/structure/machinery/door/airlock/hatch/cockpit/two{ - dir = 1 - }, -/obj/structure/blocker/forcefield/multitile_vehicles, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/drop2/sulaco) "lz" = ( /obj/effect/attach_point/weapon/dropship2/right_fore, /obj/structure/shuttle/part/dropship2/transparent/outer_right_weapons, @@ -212,6 +175,14 @@ icon_state = "62" }, /area/shuttle/drop2/sulaco) +"mn" = ( +/obj/effect/attach_point/fuel/dropship2{ + attach_id = 10 + }, +/turf/closed/shuttle/dropship2/transparent{ + icon_state = "28" + }, +/area/shuttle/drop2/sulaco) "mz" = ( /obj/structure/machinery/camera/autoname/almayer/dropship_two{ dir = 4; @@ -229,6 +200,15 @@ icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) +"mA" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ + id = "port_door"; + dir = 2 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop2/sulaco) "nq" = ( /obj/effect/attach_point/weapon/dropship2/left_fore, /obj/structure/shuttle/part/dropship2/transparent/outer_left_weapons, @@ -287,26 +267,18 @@ /obj/structure/shuttle/part/dropship2/transparent/upper_left_wing, /turf/template_noop, /area/shuttle/drop2/sulaco) -"ut" = ( -/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ - id = "port_door"; - dir = 2 - }, -/turf/open/shuttle/dropship{ - icon_state = "rasputin15" - }, -/area/shuttle/drop2/sulaco) -"uC" = ( -/obj/effect/attach_point/crew_weapon/dropship2/floor{ - attach_id = 9 - }, +"vd" = ( /turf/open/shuttle/dropship{ icon_state = "rasputin3" }, /area/shuttle/drop2/sulaco) -"vd" = ( +"vh" = ( +/obj/structure/machinery/door/airlock/multi_tile/almayer/dropshiprear/dropshipside/ds2{ + dir = 1; + id = "starboard_door" + }, /turf/open/shuttle/dropship{ - icon_state = "rasputin3" + icon_state = "rasputin15" }, /area/shuttle/drop2/sulaco) "wX" = ( @@ -353,6 +325,14 @@ icon_state = "56" }, /area/shuttle/drop2/sulaco) +"Bg" = ( +/obj/effect/attach_point/crew_weapon/dropship2/floor{ + attach_id = 7 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/drop2/sulaco) "Bi" = ( /turf/closed/shuttle/dropship2/transparent{ icon_state = "97" @@ -382,14 +362,6 @@ icon_state = "rasputin4" }, /area/shuttle/drop2/sulaco) -"Dq" = ( -/obj/effect/attach_point/electronics/dropship2{ - dir = 1; - attach_id = 6 - }, -/obj/structure/shuttle/part/dropship2/transparent/inner_right_weapons, -/turf/template_noop, -/area/shuttle/drop2/sulaco) "Dy" = ( /turf/closed/shuttle/dropship2/transparent{ icon_state = "35" @@ -505,6 +477,14 @@ /obj/structure/shuttle/part/dropship2/transparent/nose_top_left, /turf/template_noop, /area/shuttle/drop2/sulaco) +"MA" = ( +/obj/effect/attach_point/crew_weapon/dropship2/floor{ + attach_id = 9 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/drop2/sulaco) "ME" = ( /turf/closed/shuttle/dropship2/transparent{ icon_state = "96" @@ -536,6 +516,15 @@ /obj/structure/shuttle/part/dropship2/left_outer_wing_connector, /turf/template_noop, /area/shuttle/drop2/sulaco) +"Od" = ( +/obj/effect/attach_point/fuel/dropship2{ + pixel_x = -32; + attach_id = 11 + }, +/turf/closed/shuttle/dropship2/transparent{ + icon_state = "33" + }, +/area/shuttle/drop2/sulaco) "Ov" = ( /obj/structure/shuttle/part/dropship2/transparent/right_inner_bottom_wing, /turf/template_noop, @@ -683,6 +672,13 @@ icon_state = "25" }, /area/shuttle/drop2/sulaco) +"VW" = ( +/obj/structure/machinery/door/airlock/hatch/cockpit/two, +/obj/structure/blocker/forcefield/multitile_vehicles, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/drop2/sulaco) "VZ" = ( /obj/item/device/radio/intercom/normandy{ layer = 3.5; @@ -719,7 +715,7 @@ Rr Rr BG SQ -gV +mn sk Xr Rr @@ -736,7 +732,7 @@ OI GE lJ PJ -ut +mA jc pU nS @@ -823,7 +819,7 @@ LY Bi MQ VZ -lj +VW GN bJ ZK @@ -832,11 +828,11 @@ Bb Iv rc vd -db +Bg vd -ft +hn vd -uC +MA PJ Rr Rr @@ -891,7 +887,7 @@ RJ Rr Rr Rr -Dq +gH yl SY it @@ -920,7 +916,7 @@ fI fx Tp PJ -he +vh gG RG QK @@ -949,7 +945,7 @@ Rr Rr yh UP -ba +Od zt Uu Rr diff --git a/maps/shuttles/escape_shuttle_e.dmm b/maps/shuttles/escape_shuttle_e.dmm index 65efffe43619..0ba589df217e 100644 --- a/maps/shuttles/escape_shuttle_e.dmm +++ b/maps/shuttles/escape_shuttle_e.dmm @@ -9,10 +9,10 @@ icon_state = "wall2" }, /area/shuttle/escape_pod) -"f" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor0"; - dir = 8 +"e" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/e, +/turf/closed/shuttle/escapepod{ + icon_state = "wall9" }, /area/shuttle/escape_pod) "i" = ( @@ -53,6 +53,10 @@ icon_state = "wall13" }, /area/shuttle/escape_pod) +"z" = ( +/obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod, +/area/shuttle/escape_pod) "E" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" @@ -63,16 +67,16 @@ icon_state = "wall11" }, /area/shuttle/escape_pod) -"M" = ( +"L" = ( /obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod{ - icon_state = "floor4" +/obj/structure/sign/safety/cryo{ + pixel_x = -18 }, +/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) -"O" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/e, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" +"N" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor10" }, /area/shuttle/escape_pod) "Q" = ( @@ -83,15 +87,6 @@ icon_state = "floor0" }, /area/shuttle/escape_pod) -"T" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = -18 - }, -/turf/open/shuttle/escapepod{ - icon_state = "floor4" - }, -/area/shuttle/escape_pod) "W" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall4" @@ -103,20 +98,20 @@ w t I E -O +e "} (2,1,1) = {" k -M -T -M +z +L +z s "} (3,1,1) = {" d Q o -f +N s "} (4,1,1) = {" diff --git a/maps/shuttles/escape_shuttle_e_cl.dmm b/maps/shuttles/escape_shuttle_e_cl.dmm index 4b605503d7de..490f0abdfa95 100644 --- a/maps/shuttles/escape_shuttle_e_cl.dmm +++ b/maps/shuttles/escape_shuttle_e_cl.dmm @@ -25,24 +25,31 @@ icon_state = "wall13" }, /area/shuttle/escape_pod) -"n" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor0"; - dir = 8 +"i" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = -18 }, +/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) "s" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall2" }, /area/shuttle/escape_pod) -"z" = ( +"u" = ( /obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod, +/area/shuttle/escape_pod) +"v" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison{ + pixel_y = 30 + }, /turf/open/shuttle/escapepod{ - icon_state = "floor4" + icon_state = "floor0" }, /area/shuttle/escape_pod) -"D" = ( +"y" = ( /obj/structure/machinery/door/airlock/evacuation/liaison{ name = "\improper Evacuation Airlock CL-1"; id_tag = "cl_evac" @@ -61,6 +68,11 @@ icon_state = "wall6" }, /area/shuttle/escape_pod) +"K" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor10" + }, +/area/shuttle/escape_pod) "O" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall4" @@ -76,28 +88,11 @@ icon_state = "wall12" }, /area/shuttle/escape_pod) -"T" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = -18 - }, -/turf/open/shuttle/escapepod{ - icon_state = "floor4" - }, -/area/shuttle/escape_pod) "X" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" }, /area/shuttle/escape_pod) -"Z" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel/liaison{ - pixel_y = 30 - }, -/turf/open/shuttle/escapepod{ - icon_state = "floor0" - }, -/area/shuttle/escape_pod) (1,1,1) = {" h @@ -108,22 +103,22 @@ a "} (2,1,1) = {" Q -z -T -z +u +i +u E "} (3,1,1) = {" s -Z +v b -n +K E "} (4,1,1) = {" g O O -D +y I "} diff --git a/maps/shuttles/escape_shuttle_n.dmm b/maps/shuttles/escape_shuttle_n.dmm index a7a4e9a69252..71f8515daba8 100644 --- a/maps/shuttles/escape_shuttle_n.dmm +++ b/maps/shuttles/escape_shuttle_n.dmm @@ -1,64 +1,48 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"g" = ( -/turf/closed/shuttle/escapepod, -/area/shuttle/escape_pod) -"i" = ( +"a" = ( /turf/closed/shuttle/escapepod{ - icon_state = "wall1" - }, -/area/shuttle/escape_pod) -"k" = ( -/obj/structure/machinery/door/airlock/evacuation{ - dir = 2; - name = "\improper Evacuation Airlock PU-3" - }, -/turf/open/floor/almayer{ - icon_state = "test_floor4" + icon_state = "wall6" }, /area/shuttle/escape_pod) -"l" = ( +"c" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/n, /turf/closed/shuttle/escapepod{ - icon_state = "wall2" - }, -/area/shuttle/escape_pod) -"n" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor0" + icon_state = "wall9" }, /area/shuttle/escape_pod) -"p" = ( +"f" = ( /obj/structure/machinery/computer/shuttle/escape_pod_panel{ pixel_y = 30 }, /turf/open/shuttle/escapepod{ - icon_state = "floor2" + icon_state = "floor7" }, /area/shuttle/escape_pod) -"v" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/n, +"g" = ( +/turf/closed/shuttle/escapepod, +/area/shuttle/escape_pod) +"i" = ( /turf/closed/shuttle/escapepod{ - icon_state = "wall9" + icon_state = "wall1" }, /area/shuttle/escape_pod) -"x" = ( -/obj/structure/machinery/cryopod/evacuation, +"j" = ( /turf/open/shuttle/escapepod{ - icon_state = "floor4" + icon_state = "floor9" }, /area/shuttle/escape_pod) -"z" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = -35 +"k" = ( +/obj/structure/machinery/door/airlock/evacuation{ + dir = 2; + name = "\improper Evacuation Airlock PU-3" }, -/turf/open/shuttle/escapepod{ - icon_state = "floor4" +/turf/open/floor/almayer{ + icon_state = "test_floor4" }, /area/shuttle/escape_pod) -"D" = ( -/turf/open/shuttle/escapepod{ - dir = 4 +"l" = ( +/turf/closed/shuttle/escapepod{ + icon_state = "wall2" }, /area/shuttle/escape_pod) "F" = ( @@ -66,10 +50,9 @@ icon_state = "wall3" }, /area/shuttle/escape_pod) -"K" = ( -/turf/closed/shuttle/escapepod{ - icon_state = "wall6" - }, +"H" = ( +/obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) "L" = ( /turf/closed/shuttle/escapepod{ @@ -81,6 +64,19 @@ icon_state = "wall11" }, /area/shuttle/escape_pod) +"V" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = -35 + }, +/turf/open/shuttle/escapepod, +/area/shuttle/escape_pod) +"W" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor8" + }, +/area/shuttle/escape_pod) "Y" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall4" @@ -91,29 +87,29 @@ g Q Q -v +c "} (2,1,1) = {" i -p -x +f +H L "} (3,1,1) = {" k -D -z +W +V L "} (4,1,1) = {" l -n -x +j +H L "} (5,1,1) = {" F Y Y -K +a "} diff --git a/maps/shuttles/escape_shuttle_s.dmm b/maps/shuttles/escape_shuttle_s.dmm index db3f602bdb5a..82391a5218d5 100644 --- a/maps/shuttles/escape_shuttle_s.dmm +++ b/maps/shuttles/escape_shuttle_s.dmm @@ -4,29 +4,20 @@ icon_state = "wall1" }, /area/shuttle/escape_pod) -"c" = ( -/obj/structure/machinery/cryopod/evacuation, +"f" = ( /turf/open/shuttle/escapepod{ - icon_state = "floor4" + icon_state = "floor12" }, /area/shuttle/escape_pod) +"g" = ( +/obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod, +/area/shuttle/escape_pod) "n" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall2" }, /area/shuttle/escape_pod) -"o" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/s, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" - }, -/area/shuttle/escape_pod) -"q" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor0"; - dir = 1 - }, -/area/shuttle/escape_pod) "v" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall15" @@ -42,26 +33,11 @@ icon_state = "wall6" }, /area/shuttle/escape_pod) -"B" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = 8; - pixel_y = 28 - }, -/turf/open/shuttle/escapepod{ - icon_state = "floor4" - }, -/area/shuttle/escape_pod) "D" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" }, /area/shuttle/escape_pod) -"I" = ( -/turf/open/shuttle/escapepod{ - dir = 8 - }, -/area/shuttle/escape_pod) "J" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall14" @@ -72,13 +48,9 @@ icon_state = "wall4" }, /area/shuttle/escape_pod) -"N" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel{ - pixel_x = 30 - }, +"P" = ( /turf/open/shuttle/escapepod{ - icon_state = "floor0"; - dir = 8 + icon_state = "floor11" }, /area/shuttle/escape_pod) "Q" = ( @@ -86,6 +58,14 @@ icon_state = "wall13" }, /area/shuttle/escape_pod) +"R" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel{ + pixel_x = 30 + }, +/turf/open/shuttle/escapepod{ + icon_state = "floor2" + }, +/area/shuttle/escape_pod) "T" = ( /obj/structure/machinery/door/airlock/evacuation{ dir = 2; @@ -95,29 +75,43 @@ icon_state = "test_floor4" }, /area/shuttle/escape_pod) +"U" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/s, +/turf/closed/shuttle/escapepod{ + icon_state = "wall9" + }, +/area/shuttle/escape_pod) +"V" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = 8; + pixel_y = 28 + }, +/turf/open/shuttle/escapepod, +/area/shuttle/escape_pod) (1,1,1) = {" Q D D -o +U "} (2,1,1) = {" n -c -q +g +f v "} (3,1,1) = {" a -B -I +V +P T "} (4,1,1) = {" n -c -N +g +R J "} (5,1,1) = {" diff --git a/maps/shuttles/escape_shuttle_w.dmm b/maps/shuttles/escape_shuttle_w.dmm index b6b7452c798f..8f81c83b500b 100644 --- a/maps/shuttles/escape_shuttle_w.dmm +++ b/maps/shuttles/escape_shuttle_w.dmm @@ -1,12 +1,13 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE -"b" = ( +"a" = ( +/obj/docking_port/mobile/crashable/escape_shuttle/w, /turf/closed/shuttle/escapepod{ - icon_state = "wall8" + icon_state = "wall9" }, /area/shuttle/escape_pod) -"d" = ( -/turf/open/shuttle/escapepod{ - dir = 1 +"b" = ( +/turf/closed/shuttle/escapepod{ + icon_state = "wall8" }, /area/shuttle/escape_pod) "e" = ( @@ -14,12 +15,6 @@ icon_state = "wall6" }, /area/shuttle/escape_pod) -"g" = ( -/obj/docking_port/mobile/crashable/escape_shuttle/w, -/turf/closed/shuttle/escapepod{ - icon_state = "wall9" - }, -/area/shuttle/escape_pod) "j" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall7" @@ -35,12 +30,6 @@ icon_state = "wall2" }, /area/shuttle/escape_pod) -"r" = ( -/obj/structure/machinery/cryopod/evacuation, -/turf/open/shuttle/escapepod{ - icon_state = "floor4" - }, -/area/shuttle/escape_pod) "B" = ( /turf/closed/shuttle/escapepod{ icon_state = "wall10" @@ -56,19 +45,21 @@ icon_state = "wall4" }, /area/shuttle/escape_pod) -"N" = ( -/obj/structure/machinery/computer/shuttle/escape_pod_panel{ - pixel_y = 30 - }, +"H" = ( /turf/open/shuttle/escapepod{ - icon_state = "floor2" + icon_state = "floor5" }, /area/shuttle/escape_pod) -"O" = ( -/turf/open/shuttle/escapepod{ - icon_state = "floor0"; - dir = 1 +"I" = ( +/obj/structure/machinery/cryopod/evacuation, +/obj/structure/sign/safety/cryo{ + pixel_x = 36 }, +/turf/open/shuttle/escapepod, +/area/shuttle/escape_pod) +"M" = ( +/obj/structure/machinery/cryopod/evacuation, +/turf/open/shuttle/escapepod, /area/shuttle/escape_pod) "P" = ( /turf/closed/shuttle/escapepod{ @@ -83,35 +74,39 @@ icon_state = "test_floor4" }, /area/shuttle/escape_pod) -"T" = ( -/obj/structure/machinery/cryopod/evacuation, -/obj/structure/sign/safety/cryo{ - pixel_x = 36 +"V" = ( +/obj/structure/machinery/computer/shuttle/escape_pod_panel{ + pixel_y = 30 }, /turf/open/shuttle/escapepod{ icon_state = "floor4" }, /area/shuttle/escape_pod) +"W" = ( +/turf/open/shuttle/escapepod{ + icon_state = "floor12" + }, +/area/shuttle/escape_pod) (1,1,1) = {" P B S B -g +a "} (2,1,1) = {" F -N -d -O +V +H +W b "} (3,1,1) = {" p -r -T -r +M +I +M j "} (4,1,1) = {"