From 12fc0e8adfa111cec83ec03271b44f3489cdd016 Mon Sep 17 00:00:00 2001 From: silicons <2003111+silicons@users.noreply.github.com> Date: Thu, 12 May 2022 15:25:49 -0700 Subject: [PATCH] adds/fixes mapping helpers for: windows, power lines (#3992) * wacky * Wacky * pani * t * all that * fixes * coggers! * that * fix * regex * regex * okay * okay Co-authored-by: fake_vm_user --- _maps/map_files/tether/tether-01-surface1.dmm | 40 +-- _maps/map_files/tether/tether-03-surface3.dmm | 16 +- _maps/map_files/tether/tether-05-station1.dmm | 74 +++--- _maps/map_files/tether/tether-06-station2.dmm | 100 ++++---- _maps/map_files/triumph/triumph-01-deck1.dmm | 28 +-- _maps/map_files/triumph/triumph-02-deck2.dmm | 32 +-- _maps/map_files/triumph/triumph-03-deck3.dmm | 42 ++-- _maps/map_files/triumph/triumph-04-deck4.dmm | 112 ++++----- _maps/map_levels/140x140/lavaland.dmm | 34 +-- _maps/map_levels/140x140/talon/talon1.dmm | 48 ++-- _maps/map_levels/140x140/talon/talon2.dmm | 16 +- _maps/map_levels/140x140/tradeport.dmm | 74 +++--- .../level_specific/class_d/hiddenbunkerD.dmm | 12 +- .../debrisfield_vr/gecko_cr_wreck.dmm | 36 +-- .../debrisfield_vr/mackerel_lc_wreck.dmm | 24 +- .../debrisfield_vr/salamander_wreck.dmm | 28 +-- .../debrisfield_vr/tinycarrier.dmm | 12 +- _maps/templates/admin/dojo.dmm | 16 +- _maps/templates/admin/ert.dmm | 36 +-- _maps/templates/admin/kk_mercship.dmm | 28 +-- .../shuttles/overmaps/generic/bearcat.dmm | 32 +-- .../shuttles/overmaps/generic/gecko_cr.dmm | 36 +-- .../shuttles/overmaps/generic/gecko_sh.dmm | 36 +-- .../overmaps/generic/generic_shuttle.dmm | 10 +- .../shuttles/overmaps/generic/itglight.dmm | 54 ++--- .../shuttles/overmaps/generic/mackerel_hc.dmm | 22 +- .../overmaps/generic/mackerel_hc_skel.dmm | 22 +- .../shuttles/overmaps/generic/mackerel_lc.dmm | 22 +- .../shuttles/overmaps/generic/mackerel_sh.dmm | 22 +- .../shuttles/overmaps/generic/salamander.dmm | 24 +- .../shuttles/overmaps/generic/shelter_5.dmm | 8 +- .../shuttles/overmaps/generic/shelter_6.dmm | 16 +- code/__DEFINES/directional.dm | 10 + .../embedded_controller/mapping_helpers.dm | 42 ++-- .../mapping/map_helpers/_map_helpers.dm | 36 +-- .../network_builder/_network_builder.dm | 70 +++--- .../map_helpers/network_builder/atmos_pipe.dm | 96 -------- .../network_builder/power_cable.dm | 228 ++++++------------ code/modules/mapping/spawner/_spawner.dm | 80 ++++++ code/modules/mapping/spawner/window.dm | 71 ++++++ code/modules/power/cable.dm | 63 +++-- icons/mapping/spawners/map_effects.dmi | Bin 9181 -> 0 bytes icons/mapping/spawners/spawners.dmi | Bin 0 -> 216 bytes icons/mapping/spawners/windows.dmi | Bin 0 -> 6884 bytes maps/REGEXING_MAP_PORTS.md | 21 +- vorestation.dme | 2 + 46 files changed, 934 insertions(+), 897 deletions(-) delete mode 100644 code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm create mode 100644 code/modules/mapping/spawner/_spawner.dm create mode 100644 code/modules/mapping/spawner/window.dm delete mode 100644 icons/mapping/spawners/map_effects.dmi create mode 100644 icons/mapping/spawners/spawners.dmi create mode 100644 icons/mapping/spawners/windows.dmi diff --git a/_maps/map_files/tether/tether-01-surface1.dmm b/_maps/map_files/tether/tether-01-surface1.dmm index 24681e4a37f..b46b22c71aa 100644 --- a/_maps/map_files/tether/tether-01-surface1.dmm +++ b/_maps/map_files/tether/tether-01-surface1.dmm @@ -128,7 +128,7 @@ /turf/simulated/floor/plating, /area/tether/surfacebase/medical/mentalhealth) "aas" = ( -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/structure/cable{ icon_state = "1-2" }, @@ -146,7 +146,7 @@ pixel_x = 25; pixel_y = 8 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ frequency = 1379; icon_state = "door_locked"; @@ -262,7 +262,7 @@ /obj/structure/railing{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1379; @@ -459,7 +459,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals7{ dir = 9 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/embedded_controller/radio/airlock/phoron{ id_tag = "northciv_airlock"; pixel_x = 25; @@ -8546,7 +8546,7 @@ frequency = 1379; id_tag = "civ_airlock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "aot" = ( @@ -8561,7 +8561,7 @@ frequency = 1379; id_tag = "civ_airlock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "aou" = ( @@ -8877,7 +8877,7 @@ id_tag = "civ_airlock_outer"; locked = 1 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "aoX" = ( @@ -8925,7 +8925,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "apa" = ( @@ -9296,7 +9296,7 @@ id_tag = "civ_airlock_outer"; locked = 1 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "apI" = ( @@ -9319,7 +9319,7 @@ pixel_x = 25; pixel_y = -40 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled, /area/storage/surface_eva/external) "apK" = ( @@ -9330,7 +9330,7 @@ id_tag = "civ_airlock_inner"; locked = 1 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_grid, /area/storage/surface_eva/external) "apL" = ( @@ -21981,7 +21981,7 @@ id_tag = "rnd_s_airlock_inner"; locked = 1 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "aKN" = ( @@ -21998,7 +21998,7 @@ locked = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "aKO" = ( @@ -22238,7 +22238,7 @@ pixel_x = 11; pixel_y = 30 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled, /area/rnd/external) "aLp" = ( @@ -22297,7 +22297,7 @@ frequency = 1379; id_tag = "rnd_s_airlock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/rnd/external) "aLs" = ( @@ -23031,7 +23031,7 @@ id_tag = "rnd_s_airlock_outer"; locked = 1 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "aMK" = ( @@ -23047,7 +23047,7 @@ id_tag = "rnd_s_airlock_outer"; locked = 1 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/rnd/external) "aML" = ( @@ -30640,7 +30640,7 @@ /obj/effect/floor_decal/steeldecal/steel_decals3{ dir = 5 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/rnd/external) "bcV" = ( @@ -33141,7 +33141,7 @@ /area/rnd/hallway) "hpB" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ frequency = 1379; icon_state = "door_locked"; @@ -33456,7 +33456,7 @@ "hYh" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/structure/cable{ icon_state = "1-2" }, diff --git a/_maps/map_files/tether/tether-03-surface3.dmm b/_maps/map_files/tether/tether-03-surface3.dmm index 64352d7c37d..5ab8c2829c9 100644 --- a/_maps/map_files/tether/tether-03-surface3.dmm +++ b/_maps/map_files/tether/tether-03-surface3.dmm @@ -32998,7 +32998,7 @@ frequency = 1379; id_tag = "southciv_airlock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "bhZ" = ( @@ -33009,7 +33009,7 @@ icon_state = "1-2" }, /obj/structure/grille, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "southciv_airlock_pump" @@ -33061,7 +33061,7 @@ id_tag = "southciv_airlock_outer"; locked = 1 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "bif" = ( @@ -33109,7 +33109,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_grid, /area/tether/surfacebase/topairlock) "bii" = ( @@ -33248,7 +33248,7 @@ pixel_x = -8; pixel_y = -25 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ frequency = 1379; icon_state = "door_locked"; @@ -33277,12 +33277,12 @@ pixel_x = 25; pixel_y = -40 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled, /area/tether/surfacebase/topairlock) "bir" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ frequency = 1379; icon_state = "door_locked"; @@ -38546,7 +38546,7 @@ frequency = 1380; id_tag = "tourbus_right" }, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled/techfloor, /area/shuttle/tourbus/general) "jYD" = ( diff --git a/_maps/map_files/tether/tether-05-station1.dmm b/_maps/map_files/tether/tether-05-station1.dmm index ea91b85b546..ef1d8ab18f5 100644 --- a/_maps/map_files/tether/tether-05-station1.dmm +++ b/_maps/map_files/tether/tether-05-station1.dmm @@ -12748,7 +12748,7 @@ name = "Engineering Starboard External Access" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor, /area/engineering/engineering_airlock) "aCC" = ( @@ -13269,7 +13269,7 @@ frequency = 1379; id_tag = "eng_starboard_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "aEb" = ( @@ -13373,7 +13373,7 @@ req_one_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/hallway/station/docks) "aEq" = ( @@ -13743,8 +13743,8 @@ id_tag = "eng_starboard_airlock"; pixel_x = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "aFL" = ( @@ -13800,8 +13800,8 @@ frequency = 1380; id_tag = "dock_d1a1_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/hallway/station/docks) "aFX" = ( @@ -13825,7 +13825,7 @@ dir = 4 }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/station/docks) "aFZ" = ( @@ -13917,7 +13917,7 @@ name = "Engineering Starboard Internal Access" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "aHT" = ( @@ -13930,7 +13930,7 @@ name = "Engineering Starboard Internal Access" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/engineering/engineering_airlock) "aHY" = ( @@ -17247,7 +17247,7 @@ req_one_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/hallway/station/docks) "bPx" = ( @@ -17255,7 +17255,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/station/docks) "bPz" = ( @@ -17275,8 +17275,8 @@ id_tag = "dock_d2a1"; pixel_y = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/hallway/station/docks) "bPD" = ( @@ -17909,11 +17909,11 @@ id_tag = "securiship_docker"; pixel_x = -28 }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/atom/movable/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/airlock_sensor{ pixel_y = 28 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/effect/shuttle_landmark{ base_area = /area/space; base_turf = /turf/space; @@ -18288,7 +18288,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/medivac/general) "dgF" = ( @@ -18533,7 +18533,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/security/customs) "dIr" = ( @@ -18668,7 +18668,7 @@ icon_state = "1-2" }, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "dYK" = ( @@ -20984,8 +20984,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/medivac/general) "jKd" = ( @@ -21057,7 +21057,7 @@ name = "Medivac Bay" }, /obj/effect/overmap/visitable/ship/landable/medivac, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/medivac/general) "jNj" = ( @@ -22244,7 +22244,7 @@ /area/security/checkpoint/science) "nhu" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/security/customs) "njI" = ( @@ -23476,7 +23476,7 @@ "qgS" = ( /obj/machinery/door/airlock/glass_external, /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "qgW" = ( @@ -23733,7 +23733,7 @@ /area/shuttle/securiship/general) "qUd" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/medivac/general) "qWf" = ( @@ -23801,12 +23801,12 @@ /area/engineering/gravity_lobby) "rcu" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 4; pixel_y = -28 }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/general) "rgd" = ( @@ -24471,7 +24471,7 @@ id_tag = "medivac_docker_pump_out_external" }, /obj/effect/floor_decal/industrial/warning/full, -/obj/effect/map_helper/airlock/atmos/pump_out_external, +/atom/movable/map_helper/airlock/atmos/pump_out_external, /turf/simulated/floor/airless, /area/shuttle/medivac/general) "sqw" = ( @@ -24845,8 +24845,8 @@ frequency = 1380; id_tag = "medivac_docker_pump_out_internal" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/pump_out_internal, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/medivac/general) "tfs" = ( @@ -24887,7 +24887,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/general) "tjt" = ( @@ -25436,7 +25436,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/borderfloorwhite{ dir = 1 }, @@ -26091,7 +26091,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/pump_out_external, +/atom/movable/map_helper/airlock/atmos/pump_out_external, /turf/simulated/floor/airless, /area/shuttle/securiship/general) "vYM" = ( @@ -26374,7 +26374,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light/small{ dir = 8 }, @@ -26436,7 +26436,7 @@ /obj/machinery/airlock_sensor{ pixel_y = 28 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /turf/simulated/floor/tiled/eris/steel/gray_perforated, /area/shuttle/securiship/general) "wTJ" = ( @@ -26851,7 +26851,7 @@ "xJU" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/medivac/general) "xMb" = ( @@ -26969,7 +26969,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/aux, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/eris/techmaint_panels, /area/shuttle/securiship/general) "xTY" = ( diff --git a/_maps/map_files/tether/tether-06-station2.dmm b/_maps/map_files/tether/tether-06-station2.dmm index d2e23ddda2a..d03e5852ace 100644 --- a/_maps/map_files/tether/tether-06-station2.dmm +++ b/_maps/map_files/tether/tether-06-station2.dmm @@ -4336,7 +4336,7 @@ frequency = 1380; id_tag = "expshuttle_docker_pump_out_external" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 4 }, @@ -5802,7 +5802,7 @@ /turf/simulated/open, /area/tether/exploration) "ati" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/airlock_sensor{ dir = 8; pixel_x = 26; @@ -6351,7 +6351,7 @@ name = "EXTERNAL AIRLOCK"; pixel_y = -32 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "auM" = ( @@ -6375,8 +6375,8 @@ pixel_y = -28 }, /obj/machinery/camera/network/command, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled, /area/ai_monitored/storage/eva) "auO" = ( @@ -6391,7 +6391,7 @@ pixel_y = -26; req_access = list(18) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/ai_monitored/storage/eva) "auP" = ( @@ -7047,7 +7047,7 @@ frequency = 1380; id_tag = "expshuttle_docker_pump_out_external" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/shuttle_landmark{ base_area = /area/tether/exploration; @@ -9158,8 +9158,8 @@ /obj/effect/floor_decal/industrial/warning{ dir = 8 }, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 8 }, @@ -10209,7 +10209,7 @@ id_tag = "expshuttle_docker"; pixel_y = 28 }, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/atom/movable/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; frequency = 1380; @@ -10503,7 +10503,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ai_core_foyer) "aMZ" = ( -/obj/effect/map_helper/airlock/atmos/pump_out_external, +/atom/movable/map_helper/airlock/atmos/pump_out_external, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "sec_fore_pump" @@ -10882,8 +10882,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 28 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; frequency = 1380; @@ -11063,7 +11063,7 @@ frequency = 1380; id_tag = "expshuttle_docker_pump_out_external" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/pipe/simple/hidden/fuel{ dir = 5 }, @@ -13876,7 +13876,7 @@ /area/shuttle/large_escape_pod1) "aYI" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) "aYM" = ( @@ -14634,7 +14634,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/excursion/general) "bUK" = ( @@ -15017,7 +15017,7 @@ /area/tether/station/dock_one) "cQI" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "cRn" = ( @@ -15443,11 +15443,11 @@ /turf/simulated/floor/tiled, /area/quartermaster/office) "dGA" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ pixel_y = 28 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; frequency = 1379; @@ -15856,7 +15856,7 @@ req_one_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "ejm" = ( @@ -17929,7 +17929,7 @@ /turf/simulated/floor/tiled/dark, /area/quartermaster/warehouse) "hMg" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; frequency = 1379; @@ -18092,8 +18092,8 @@ frequency = 1380; id_tag = "dock_d2a_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "hZK" = ( @@ -18363,7 +18363,7 @@ dir = 4; id = "QMLoad2" }, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) "iAx" = ( @@ -18800,7 +18800,7 @@ /area/crew_quarters/sleep/spacedorm1) "jpv" = ( /obj/effect/floor_decal/industrial/hatch/yellow, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /obj/machinery/door/airlock/multi_tile/glass, /turf/simulated/floor/tiled/monofloor{ dir = 8 @@ -19137,7 +19137,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "jSo" = ( @@ -19875,7 +19875,7 @@ /area/tether/station/burial) "lfm" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 8 }, @@ -19939,7 +19939,7 @@ "lms" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/quartermaster/storage) "loC" = ( @@ -19991,7 +19991,7 @@ /turf/simulated/floor/plating, /area/maintenance/substation/cargo) "lvY" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1379; id_tag = "belter_access_pump" @@ -20042,7 +20042,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "lGU" = ( @@ -20393,7 +20393,7 @@ req_one_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "mnz" = ( @@ -20475,13 +20475,13 @@ id_tag = "dock_d2r"; pixel_y = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "mCB" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "mDI" = ( @@ -21680,7 +21680,7 @@ req_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "ozR" = ( @@ -22111,7 +22111,7 @@ dir = 4; id = "QMLoad" }, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/storage) "pdh" = ( @@ -22333,8 +22333,8 @@ id_tag = "dock_cshutt"; pixel_y = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "pyf" = ( @@ -23129,7 +23129,7 @@ /area/tether/exploration/pilot_office) "qOb" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) @@ -23454,7 +23454,7 @@ frequency = 1380; id_tag = "dock_d1l_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "ruj" = ( @@ -23533,7 +23533,7 @@ /turf/simulated/floor/tiled, /area/tether/station/visitorhallway/lounge) "rDG" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light/small{ dir = 8 }, @@ -23727,8 +23727,8 @@ pixel_x = 30; pixel_y = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "rSM" = ( @@ -23752,7 +23752,7 @@ req_one_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/quartermaster/foyer) "rYs" = ( @@ -24152,8 +24152,8 @@ id_tag = "dock_d2b"; pixel_y = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "sRw" = ( @@ -25778,7 +25778,7 @@ dir = 4 }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "vLQ" = ( @@ -25836,7 +25836,7 @@ req_one_access = list(13) }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/tether/station/dock_one) "vSZ" = ( @@ -26566,7 +26566,7 @@ /turf/simulated/floor/wood, /area/tether/exploration/pathfinder_office) "xjm" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ id_tag = "belter_access_airlock"; pixel_y = 28 @@ -27156,7 +27156,7 @@ /area/maintenance/station/cargo) "yht" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, diff --git a/_maps/map_files/triumph/triumph-01-deck1.dmm b/_maps/map_files/triumph/triumph-01-deck1.dmm index 4d7611ebc3c..f2d14143469 100644 --- a/_maps/map_files/triumph/triumph-01-deck1.dmm +++ b/_maps/map_files/triumph/triumph-01-deck1.dmm @@ -155,7 +155,7 @@ /turf/simulated/floor/plating, /area/maintenance/engineering) "aH" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/effect/floor_decal/industrial/warning, /obj/machinery/access_button/airlock_interior{ frequency = 1380; @@ -3513,7 +3513,7 @@ /area/maintenance/engineering) "mp" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/effect/floor_decal/industrial/warning, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/techfloor/grid, @@ -3690,8 +3690,8 @@ dir = 8; id_tag = "deck1_airlock" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "mS" = ( @@ -6920,8 +6920,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ dir = 8; id_tag = "deck1_airlock2"; @@ -12745,7 +12745,7 @@ /area/engineering/atmos) "Rp" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) @@ -13103,7 +13103,7 @@ /area/engineering/storage) "Sm" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ frequency = 1380; master_tag = "deck1_airlock"; @@ -13152,7 +13152,7 @@ /turf/simulated/floor/carpet, /area/maintenance/dormitory) "Sw" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -13189,7 +13189,7 @@ /area/engineering/hallway) "SA" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ master_tag = "deck1_airlock2"; pixel_x = 24 @@ -13610,7 +13610,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/storage) "Ud" = ( @@ -14115,7 +14115,7 @@ /turf/simulated/floor/tiled, /area/station/stairs_one) "VG" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, @@ -14340,7 +14340,7 @@ dir = 8; id_tag = "deck1_airlock" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/engine_eva) "Wv" = ( @@ -14974,7 +14974,7 @@ /area/engineering/atmos/monitoring) "YE" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/techfloor/grid, /area/engineering/atmos/storage) diff --git a/_maps/map_files/triumph/triumph-02-deck2.dmm b/_maps/map_files/triumph/triumph-02-deck2.dmm index ce5b75c58be..d9c2671fb8a 100644 --- a/_maps/map_files/triumph/triumph-02-deck2.dmm +++ b/_maps/map_files/triumph/triumph-02-deck2.dmm @@ -194,7 +194,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "aA" = ( @@ -1081,7 +1081,7 @@ "dq" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "dr" = ( @@ -2506,7 +2506,7 @@ id = "QMLoad2" }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "hh" = ( @@ -3995,7 +3995,7 @@ id = "QMLoad" }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "lo" = ( @@ -4778,7 +4778,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "nn" = ( @@ -7485,7 +7485,7 @@ id_tag = "solar_dock"; pixel_x = -24 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "uC" = ( @@ -7864,7 +7864,7 @@ icon_state = "1-2" }, /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button/airlock_interior{ frequency = 1380; master_tag = "triumph_annex_dock"; @@ -8724,8 +8724,8 @@ frequency = 1380; id_tag = "triumph_annex_dock_pump" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/crew_quarters/bar) "yt" = ( @@ -12099,7 +12099,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "In" = ( @@ -12375,7 +12375,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ name = "Bar External Access" }, @@ -14713,7 +14713,7 @@ "Qh" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ name = "Bar Internal Access" }, @@ -14949,7 +14949,7 @@ }, /obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "Rc" = ( @@ -15492,7 +15492,7 @@ "SA" = ( /obj/machinery/door/firedoor, /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ frequency = 1380; master_tag = "triumph_annex_dock"; @@ -16260,7 +16260,7 @@ }, /obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "UI" = ( @@ -17518,7 +17518,7 @@ /obj/machinery/door/firedoor/border_only, /obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "XK" = ( diff --git a/_maps/map_files/triumph/triumph-03-deck3.dmm b/_maps/map_files/triumph/triumph-03-deck3.dmm index 90469f48549..88d6f6ab922 100644 --- a/_maps/map_files/triumph/triumph-03-deck3.dmm +++ b/_maps/map_files/triumph/triumph-03-deck3.dmm @@ -2364,7 +2364,7 @@ /area/medical/medbay3) "bWI" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/voidcraft/vertical{ frequency = 1380; id_tag = null @@ -2483,7 +2483,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -5703,7 +5703,7 @@ dir = 4; id_tag = "deck3_airlock" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "deck3_airlock"; @@ -6512,7 +6512,7 @@ pixel_x = -30; pixel_y = 10 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "fqT" = ( @@ -9987,7 +9987,7 @@ /turf/simulated/floor/tiled/white, /area/medical/medbay4) "ieP" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -11591,7 +11591,7 @@ name = "Public Airlock" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -11750,7 +11750,7 @@ /area/medical/recoveryrestroom) "jNn" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/voidcraft/vertical{ frequency = 1380; id_tag = null @@ -13054,7 +13054,7 @@ id_tag = "emt_shuttle_dock"; pixel_y = 26 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -13565,7 +13565,7 @@ /area/rnd/research) "lhX" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -13827,7 +13827,7 @@ /obj/machinery/camera/network/civilian{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; id_tag = "deck3_airlock" @@ -14328,8 +14328,8 @@ id_tag = "deck3_airlock"; pixel_y = -22 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; id_tag = "deck3_airlock" @@ -16139,7 +16139,7 @@ /obj/machinery/door/airlock/glass_external{ name = "Public Airlock" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -16827,8 +16827,8 @@ /area/maintenance/fore) "nRz" = ( /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "emt_shuttle_docker"; @@ -18656,7 +18656,7 @@ "pfl" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ dir = 1; frequency = 1380; @@ -19461,7 +19461,7 @@ /turf/simulated/floor/tiled, /area/rnd/test_area) "pFM" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, @@ -20730,7 +20730,7 @@ pixel_x = -20; pixel_y = -5 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/white, /area/shuttle/emt/general) "qzn" = ( @@ -22572,7 +22572,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/medical/patient_wing) "rLP" = ( @@ -24235,7 +24235,7 @@ name = "Public Airlock" }, /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -28011,7 +28011,7 @@ "vXc" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button/airlock_interior{ dir = 1; frequency = 1380; diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm index 0a7578944b2..8619bd6453a 100644 --- a/_maps/map_files/triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/triumph/triumph-04-deck4.dmm @@ -1166,7 +1166,7 @@ /area/bridge) "aUx" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -2199,7 +2199,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button/airlock_interior{ dir = 4; @@ -2660,7 +2660,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/voidcraft/vertical, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) @@ -2937,7 +2937,7 @@ /area/security/brig) "cgx" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button/airlock_exterior{ dir = 1; @@ -3261,7 +3261,7 @@ name = "Docking Port Airlock" }, /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ dir = 1; frequency = 1380; @@ -3450,8 +3450,8 @@ id_tag = "expshuttle_dock"; pixel_y = -24 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -3577,7 +3577,7 @@ }, /obj/machinery/light, /obj/machinery/atmospherics/pipe/manifold4w/hidden/cyan, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ id_tag = "civvie_docker"; pixel_y = -24 @@ -4574,8 +4574,8 @@ id_tag = "deck4_airlock"; pixel_y = -22 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "duu" = ( @@ -4951,7 +4951,7 @@ /area/security/riot_control) "dFN" = ( /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, @@ -5358,7 +5358,7 @@ pixel_x = 5; pixel_y = 25 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/voidcraft/vertical, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) @@ -6375,7 +6375,7 @@ /turf/simulated/floor/tiled, /area/shuttle/excursion/cockpit) "eCD" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "civvie_dock"; @@ -6422,7 +6422,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "eEq" = ( @@ -8540,7 +8540,7 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/captain) "fUd" = ( -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/blast/regular{ density = 0; icon_state = "pdoor0"; @@ -9787,7 +9787,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/voidcraft/vertical, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ frequency = 1380; master_tag = "courser_docker"; @@ -10948,7 +10948,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "hCx" = ( @@ -12424,7 +12424,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -12607,7 +12607,7 @@ frequency = 1380; id_tag = "expshuttle_dock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "iEd" = ( @@ -12952,7 +12952,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ id_tag = "expshuttle_docker"; pixel_x = 24 @@ -12962,7 +12962,7 @@ id_tag = "expshuttle_docker_pump"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/outline/yellow, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) @@ -13428,7 +13428,7 @@ icon_state = "4-8" }, /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -13821,7 +13821,7 @@ pixel_y = -8 }, /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "jxD" = ( @@ -13936,7 +13936,7 @@ /area/maintenance/chapel) "jCa" = ( /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/voidcraft/vertical, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) @@ -14799,7 +14799,7 @@ id_tag = "courser_dock"; pixel_x = 25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "courser_dock"; @@ -15034,7 +15034,7 @@ id_tag = "civvie_docker_pump" }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "kvv" = ( @@ -16097,7 +16097,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button/airlock_interior{ dir = 4; frequency = 1380; @@ -18310,7 +18310,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ frequency = 1380; master_tag = "courser_dock"; @@ -18715,7 +18715,7 @@ req_one_access = list(19,43,67) }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "mTK" = ( @@ -19005,7 +19005,7 @@ /area/maintenance/security/starboard) "nfc" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button/airlock_exterior{ dir = 1; @@ -19447,7 +19447,7 @@ /area/security/eva) "nuT" = ( /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button/airlock_exterior{ dir = 8; @@ -19554,7 +19554,7 @@ /turf/simulated/floor/tiled/dark, /area/hallway/primary/aft) "nyt" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button/airlock_interior{ dir = 1; @@ -19762,7 +19762,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -21081,7 +21081,7 @@ name = "Docking Port Airlock" }, /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button/airlock_interior{ dir = 1; frequency = 1380; @@ -21441,7 +21441,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/firedoor, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "oPJ" = ( @@ -21570,7 +21570,7 @@ /area/security/brig) "oUI" = ( /obj/machinery/door/airlock/voidcraft/vertical, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/shuttle/courser/general) "oUQ" = ( @@ -22659,7 +22659,7 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/tram) "pFz" = ( -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/voidcraft/vertical, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) @@ -23076,7 +23076,7 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "pSB" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button/airlock_interior{ frequency = 1380; master_tag = "expshuttle_docker"; @@ -23865,7 +23865,7 @@ frequency = 1380; id_tag = "courser_dock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/exploration/pilot_prep) "qnU" = ( @@ -25733,7 +25733,7 @@ frequency = 1380; id_tag = "civvie_docker_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "rsP" = ( @@ -25878,8 +25878,8 @@ frequency = 1380; id_tag = "deck4_dockarm1_pump" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "rBF" = ( @@ -26731,7 +26731,7 @@ id_tag = "courser_docker_pump"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/catwalk, /turf/simulated/floor/plating, /area/shuttle/courser/general) @@ -26795,7 +26795,7 @@ /obj/machinery/door/airlock/voidcraft/vertical{ name = "cockpit hatch" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button/airlock_interior{ dir = 4; frequency = 1380; @@ -26856,7 +26856,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(19,43,67) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/exploration/explorer_prep) "skS" = ( @@ -26883,8 +26883,8 @@ id_tag = "deck4_dockarm2"; pixel_x = 23 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "slE" = ( @@ -27245,7 +27245,7 @@ icon_state = "4-8" }, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1380; @@ -27928,7 +27928,7 @@ /area/shuttle/courser/cockpit) "sPW" = ( /obj/machinery/atmospherics/pipe/simple/hidden, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -28090,7 +28090,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) @@ -28581,13 +28581,13 @@ id_tag = "courser_docker_pump"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "courser_docker"; pixel_x = -24 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/structure/handrail{ dir = 4 }, @@ -29633,7 +29633,7 @@ /turf/simulated/floor/wood, /area/library) "ufP" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/outline/yellow, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; @@ -30194,7 +30194,7 @@ /obj/machinery/door/airlock/glass_external{ name = "Docking Port Airlock" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "uxl" = ( @@ -34776,7 +34776,7 @@ name = "Docking Port Airlock" }, /obj/machinery/shield_diffuser, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "xte" = ( @@ -35331,7 +35331,7 @@ /turf/simulated/floor/tiled, /area/security/hanger) "xOo" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external, /obj/machinery/access_button/airlock_interior{ dir = 1; diff --git a/_maps/map_levels/140x140/lavaland.dmm b/_maps/map_levels/140x140/lavaland.dmm index 57f5b26ee5d..1de3fde69c9 100644 --- a/_maps/map_levels/140x140/lavaland.dmm +++ b/_maps/map_levels/140x140/lavaland.dmm @@ -625,7 +625,7 @@ pixel_y = 25; req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, @@ -761,7 +761,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button{ dir = 4; frequency = 1384; @@ -816,7 +816,7 @@ id_tag = "mining_engine"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "pQ" = ( @@ -986,7 +986,7 @@ id_tag = "mining_engine"; pixel_y = -25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "rV" = ( @@ -1031,7 +1031,7 @@ id_tag = "mining_outpost"; pixel_y = -25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/light/small, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; @@ -1039,7 +1039,7 @@ id_tag = "mining_outpost"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "sQ" = ( @@ -1329,7 +1329,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ dir = 8; frequency = 1384; @@ -1500,7 +1500,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, @@ -1635,7 +1635,7 @@ /turf/simulated/floor/tiled/old_tile, /area/lavaland/central/base/common) "Fe" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior{ dir = 4; frequency = 1384; @@ -1940,7 +1940,7 @@ /turf/simulated/floor/carpet/purcarpet, /area/lavaland/central/base/common) "KB" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1; frequency = 1384; @@ -1965,7 +1965,7 @@ id_tag = "mining_engine"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "KX" = ( @@ -1980,7 +1980,7 @@ pixel_y = -25; req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, @@ -2208,7 +2208,7 @@ id_tag = "mining_outpost"; power_rating = 20000 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/lavaland/central/base/common) "Qo" = ( @@ -2231,7 +2231,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/structure/fans/tiny, /turf/simulated/floor/plating, /area/lavaland/central/base/common) @@ -2269,7 +2269,7 @@ pixel_x = -22; pixel_y = -4 }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/outdoors/lavaland, /area/lavaland/central/base/common) "RJ" = ( @@ -2408,7 +2408,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/lavaland/central/base/common) "TQ" = ( @@ -2601,7 +2601,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(48) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(48) }, diff --git a/_maps/map_levels/140x140/talon/talon1.dmm b/_maps/map_levels/140x140/talon/talon1.dmm index d57cceb4dcd..446719e42be 100644 --- a/_maps/map_levels/140x140/talon/talon1.dmm +++ b/_maps/map_levels/140x140/talon/talon1.dmm @@ -135,7 +135,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external, /turf/simulated/floor/plating, /area/talon/maintenance/deckone_port) @@ -1307,7 +1307,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating/eris/under, /area/talon/maintenance/deckone_starboard) "lb" = ( @@ -1419,8 +1419,8 @@ pixel_x = -28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/light/small{ dir = 1 }, @@ -1533,7 +1533,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/deckone_port) "ne" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor{ dir = 8; pixel_x = 28; @@ -1605,7 +1605,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, @@ -1772,7 +1772,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, @@ -1869,7 +1869,7 @@ id_tag = "talon_boat"; pixel_x = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux{ dir = 8 }, @@ -2285,7 +2285,7 @@ /turf/simulated/wall, /area/talon/deckone/central_hallway) "ta" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 10 }, @@ -2352,7 +2352,7 @@ /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/talon/maintenance/deckone_port) "tE" = ( @@ -2462,7 +2462,7 @@ /turf/simulated/floor/plating, /area/talon/maintenance/deckone_starboard) "uF" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/aux, /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) @@ -2520,8 +2520,8 @@ pixel_y = -30; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ pixel_y = 28; req_one_access = list(301) @@ -2641,7 +2641,7 @@ dir = 1; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled/eris/dark/techfloor, /area/shuttle/talonboat) "vW" = ( @@ -2770,7 +2770,7 @@ pixel_y = 28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/structure/catwalk, /turf/simulated/floor/airless, /area/talon/maintenance/deckone_starboard) @@ -3654,7 +3654,7 @@ /area/talon/deckone/brig) "CU" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; @@ -3876,8 +3876,8 @@ req_one_access = list(301); tag_airpump = "talon_port_wing_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ pixel_y = 28; req_one_access = list(301) @@ -4190,7 +4190,7 @@ pixel_y = 28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, @@ -4600,8 +4600,8 @@ /area/talon/deckone/central_hallway) "JF" = ( /obj/machinery/light/small, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "talon_port"; @@ -5345,7 +5345,7 @@ /turf/simulated/floor/tiled/eris/steel, /area/talon/deckone/central_hallway) "QD" = ( -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, @@ -5353,7 +5353,7 @@ pixel_x = 28; pixel_y = -4 }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/eris/dark/gray_perforated, /area/shuttle/talonboat) "QM" = ( @@ -6442,7 +6442,7 @@ pixel_y = 28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/atmospherics/pipe/simple/hidden/aux{ dir = 4 }, diff --git a/_maps/map_levels/140x140/talon/talon2.dmm b/_maps/map_levels/140x140/talon/talon2.dmm index 133b1735374..d144de12eb8 100644 --- a/_maps/map_levels/140x140/talon/talon2.dmm +++ b/_maps/map_levels/140x140/talon/talon2.dmm @@ -239,7 +239,7 @@ pixel_y = -28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/atmospherics/pipe/simple/visible/aux{ dir = 10 }, @@ -2537,7 +2537,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /turf/simulated/floor/tiled/techfloor, /area/talon/decktwo/lifeboat) "Cu" = ( @@ -2710,7 +2710,7 @@ /turf/simulated/floor/tiled/eris/white, /area/talon/decktwo/central_hallway) "DO" = ( -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) }, @@ -2765,7 +2765,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /obj/structure/cable/green{ d1 = 1; d2 = 2; @@ -2901,8 +2901,8 @@ pixel_x = 28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume/aux{ dir = 1 }, @@ -3068,7 +3068,7 @@ pixel_y = 28; req_one_access = list(301) }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/hull/airless, /area/talon/maintenance/decktwo_aft) "Ht" = ( @@ -3197,7 +3197,7 @@ /turf/simulated/floor/bluegrid, /area/talon/decktwo/tech) "Ju" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/visible/aux, /obj/machinery/door/airlock/glass_external{ req_one_access = list(301) diff --git a/_maps/map_levels/140x140/tradeport.dmm b/_maps/map_levels/140x140/tradeport.dmm index af1c2cff17a..c6ced3801b0 100644 --- a/_maps/map_levels/140x140/tradeport.dmm +++ b/_maps/map_levels/140x140/tradeport.dmm @@ -927,8 +927,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "di" = ( @@ -1038,7 +1038,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "dA" = ( @@ -1064,7 +1064,7 @@ frequency = null; name = "Ship Hatch" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "dD" = ( @@ -1743,7 +1743,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ name = "Nebula Gas - Employees Only" }, @@ -1920,7 +1920,7 @@ frequency = null; name = "Ship Hatch" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "gV" = ( @@ -2089,7 +2089,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; @@ -2803,7 +2803,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/glass_external{ frequency = null; name = "Ship Hatch" @@ -3488,7 +3488,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; @@ -3826,7 +3826,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "nP" = ( @@ -4887,7 +4887,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1380; @@ -5653,7 +5653,7 @@ /obj/machinery/airlock_sensor{ pixel_y = -25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/plating, /area/tradeport/pads) "up" = ( @@ -6029,7 +6029,7 @@ /turf/simulated/floor/tiled/monotile, /area/tradeport/medical) "vD" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ frequency = null; name = "Ship Hatch" @@ -6209,7 +6209,7 @@ /area/tradeport/facility) "wc" = ( /obj/machinery/atmospherics/pipe/simple/visible, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; @@ -6385,7 +6385,7 @@ /turf/space, /area/space) "wQ" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ pixel_y = -25 }, @@ -6400,7 +6400,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -6545,7 +6545,7 @@ /obj/machinery/door/airlock/external/glass{ req_access = list(160) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; pixel_x = -10; @@ -6873,8 +6873,8 @@ master_tag = null; pixel_x = 25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "yi" = ( @@ -6934,7 +6934,7 @@ frequency = null; name = "Ship Hatch" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "yr" = ( @@ -7101,12 +7101,12 @@ /turf/simulated/floor/tiled/old_tile/white, /area/tradeport) "yZ" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ pixel_x = -25; pixel_y = 25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1380; id_tag = "trade_pumps" @@ -7355,7 +7355,7 @@ frequency = 1380; id_tag = "trade_docks" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor, /area/tradeport/pads) "zV" = ( @@ -7567,7 +7567,7 @@ /area/tradeport/medical) "Bi" = ( /obj/machinery/atmospherics/component/unary/vent_pump/on, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/tradeport/pads) "Bj" = ( @@ -7577,7 +7577,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ name = "Nebula Gas - Employees Only" }, @@ -8153,7 +8153,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1380; @@ -8372,7 +8372,7 @@ id_tag = "tradeport_hangar_dock"; pixel_x = 25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "Em" = ( @@ -8420,7 +8420,7 @@ /turf/simulated/floor/wood, /area/tradeport/cyndi) "Eu" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ frequency = 1380; id_tag = "trade_pumps" @@ -9913,7 +9913,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ frequency = null; name = "Ship Hatch" @@ -10952,7 +10952,7 @@ /obj/machinery/door/firedoor{ req_one_access = list(160) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external{ name = "Nebula Gas - Employees Only" }, @@ -10989,7 +10989,7 @@ frequency = null; name = "Ship Hatch" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/shuttle/trade_ship/general) "Op" = ( @@ -11759,7 +11759,7 @@ frequency = 1380; id_tag = "tradeport_hangar_dock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/neutral, /area/tradeport/commons) "Rd" = ( @@ -11797,7 +11797,7 @@ /obj/machinery/door/airlock/glass_external{ name = "Nebula Gas - External Access" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button/airlock_exterior{ frequency = 1380; master_tag = "trade_docks"; @@ -12095,7 +12095,7 @@ /obj/machinery/door/airlock/glass_external{ name = "Nebula Gas - External Access" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -13524,7 +13524,7 @@ frequency = 1380; id_tag = "trade_docks" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ frequency = 1380; id_tag = "trade_docks"; @@ -13569,7 +13569,7 @@ pixel_x = -25; pixel_y = 25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/effect/floor_decal/rust, /turf/simulated/floor, /area/tradeport/pads) @@ -14087,7 +14087,7 @@ /obj/machinery/door/airlock/external/glass{ req_access = list(160) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button{ command = "cycle_interior"; pixel_x = 10; diff --git a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm b/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm index f93e2c9b014..a9dca90b72e 100644 --- a/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm +++ b/_maps/submaps/level_specific/class_d/hiddenbunkerD.dmm @@ -41,7 +41,7 @@ /area/class_d/Mountain) "hZ" = ( /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/class_d/Mountain) "is" = ( @@ -90,7 +90,7 @@ id_tag = "bunkerD_internal"; locked = 1 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/class_d/Mountain) "pq" = ( @@ -353,8 +353,8 @@ frequency = 1379; id_tag = "rnd_s_airlock_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ frequency = 804; id_tag = "bunkerD_sensor"; @@ -400,7 +400,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled, /area/class_d/Mountain) "Ys" = ( @@ -420,7 +420,7 @@ id_tag = "bunkerD_external"; locked = 1 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled, /area/class_d/Mountain) diff --git a/_maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm b/_maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm index 7ef393a4db4..c0234ed9bad 100644 --- a/_maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm +++ b/_maps/submaps/level_specific/debrisfield_vr/gecko_cr_wreck.dmm @@ -156,7 +156,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -454,8 +454,8 @@ /turf/simulated/floor/reinforced/airless, /area/shuttle/gecko_cr_wreck) "kd" = ( -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -681,7 +681,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -862,8 +862,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/light{ @@ -1215,8 +1215,8 @@ /area/shuttle/gecko_cr_engineering_wreck) "yE" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -1241,7 +1241,7 @@ /area/shuttle/gecko_cr_engineering_wreck) "zx" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit_wreck) @@ -1359,7 +1359,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -1429,7 +1429,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1855,7 +1855,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -2184,7 +2184,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ @@ -2268,7 +2268,7 @@ "PD" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit_wreck) "PI" = ( @@ -2522,8 +2522,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/light{ @@ -2834,7 +2834,7 @@ /area/shuttle/gecko_cr_engineering_wreck) "Yj" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ @@ -2850,7 +2850,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, diff --git a/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm b/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm index dca0027e9a4..dabe03d6bdd 100644 --- a/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm +++ b/_maps/submaps/level_specific/debrisfield_vr/mackerel_lc_wreck.dmm @@ -170,8 +170,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, @@ -223,8 +223,8 @@ /area/shuttle/mackerel_lc_wreck) "pZ" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -304,7 +304,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 24 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/railing/grey, /obj/random/empty_or_lootable_crate, @@ -543,8 +543,8 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) "FL" = ( -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -610,7 +610,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/mackerel_lc_wreck) "Ib" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/hatch, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_lc_wreck) @@ -724,7 +724,7 @@ }, /area/shuttle/mackerel_lc_wreck) "PL" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/hatch{ density = 0; icon_state = "door_open"; @@ -787,7 +787,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, @@ -810,8 +810,8 @@ dir = 1 }, /obj/structure/handrail, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/warning{ dir = 4 }, diff --git a/_maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm b/_maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm index ed449451a87..b2960e7e7c3 100644 --- a/_maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm +++ b/_maps/submaps/level_specific/debrisfield_vr/salamander_wreck.dmm @@ -1,14 +1,14 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_wreck) "aK" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 1; pixel_x = 24; @@ -47,7 +47,7 @@ }, /area/shuttle/salamander_wreck_head) "bu" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/airlock_sensor{ dir = 4; @@ -185,7 +185,7 @@ /area/shuttle/salamander_wreck_head) "cX" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_wreck) @@ -276,7 +276,7 @@ }, /area/shuttle/salamander_wreck_q2) "eJ" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/airlock_sensor{ dir = 8; pixel_x = 21 @@ -890,8 +890,8 @@ }, /area/shuttle/salamander_wreck_engineering) "mg" = ( -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ pixel_x = 24; pixel_y = -11 @@ -1002,7 +1002,7 @@ /area/shuttle/salamander_wreck) "oe" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_wreck) "oi" = ( @@ -1091,7 +1091,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander_wreck) @@ -1372,7 +1372,7 @@ }, /area/shuttle/salamander_wreck) "BE" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/airlock/glass_external/public{ density = 0; icon_state = "door_open" @@ -1544,7 +1544,7 @@ /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "Kw" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, @@ -1683,7 +1683,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) @@ -1811,7 +1811,7 @@ density = 0; icon_state = "door_open" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techmaint/airless, /area/shuttle/salamander_wreck) "Vh" = ( diff --git a/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm b/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm index 74075647220..6343a2a1fb7 100644 --- a/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm +++ b/_maps/submaps/level_specific/debrisfield_vr/tinycarrier.dmm @@ -39,7 +39,7 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/monofloor, /area/submap/debrisfield_vr/tinyshuttle/crew) "ag" = ( @@ -59,7 +59,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/wall/thull, /area/submap/debrisfield_vr/tinyshuttle/crew) "aj" = ( @@ -83,7 +83,7 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/monofloor{ dir = 4 }, @@ -108,8 +108,8 @@ pixel_x = 26; pixel_y = 6 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/effect/overmap/visitable/ship/landable/tinycarrier, /turf/simulated/floor/tiled/monotile, /area/submap/debrisfield_vr/tinyshuttle/crew) @@ -169,7 +169,7 @@ dir = 8; pixel_x = 24 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/corner/brown{ dir = 6 }, diff --git a/_maps/templates/admin/dojo.dmm b/_maps/templates/admin/dojo.dmm index 207165c88df..8cd2e84d104 100644 --- a/_maps/templates/admin/dojo.dmm +++ b/_maps/templates/admin/dojo.dmm @@ -229,7 +229,7 @@ /obj/machinery/door/airlock{ icon = 'icons/obj/doors/Dooruranium.dmi' }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" @@ -250,13 +250,13 @@ name = "Outer Airlock"; opacity = 0 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor{ dir = 8; pixel_y = -27; req_access = list(150) }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/ninja) "aL" = ( @@ -271,7 +271,7 @@ pixel_y = 28; req_access = list(150) }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/effect/overmap/visitable/ship/landable/ninja, /turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/ninja) @@ -329,7 +329,7 @@ name = "ship lockdown control"; pixel_x = -25 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/ninja) "aT" = ( @@ -342,7 +342,7 @@ name = "Ship Internal Hatch"; req_access = list(150) }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/shuttle/floor/voidcraft/dark, /area/shuttle/ninja) "aU" = ( @@ -395,7 +395,7 @@ pixel_x = -27; req_access = list(150) }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/computer/station_alert{ dir = 4 }, @@ -889,7 +889,7 @@ /obj/machinery/door/airlock{ icon = 'icons/obj/doors/Dooruranium.dmi' }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/unsimulated/floor{ icon_state = "plating"; name = "plating" diff --git a/_maps/templates/admin/ert.dmm b/_maps/templates/admin/ert.dmm index 1afc592a235..43c0a176a31 100644 --- a/_maps/templates/admin/ert.dmm +++ b/_maps/templates/admin/ert.dmm @@ -9,13 +9,13 @@ /area/ship/ert/dock_port) "ae" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior{ dir = 1; pixel_x = 24; pixel_y = 11 }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "af" = ( @@ -39,7 +39,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -52,7 +52,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 24 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -199,7 +199,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light{ dir = 8 }, @@ -217,7 +217,7 @@ /area/ship/ert/atmos) "ch" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "ci" = ( @@ -316,7 +316,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light{ dir = 8 }, @@ -478,13 +478,13 @@ /area/ship/ert/dock_port) "dY" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "ee" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "ef" = ( @@ -896,7 +896,7 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -1326,8 +1326,8 @@ pixel_x = 24; pixel_y = -11 }, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "lz" = ( @@ -1608,7 +1608,7 @@ /obj/machinery/airlock_sensor{ pixel_y = -23 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -2818,7 +2818,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/floor_decal/industrial/warning, /obj/structure/sign/vacuum{ pixel_x = -32 @@ -3287,7 +3287,7 @@ /area/ship/ert/hallways_aft) "yo" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) "yp" = ( @@ -5300,7 +5300,7 @@ /area/ship/ert/med_surg) "LR" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_port) "LV" = ( @@ -6172,7 +6172,7 @@ /area/ship/ert/engineering) "Rh" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/door/firedoor/multi_tile, /turf/simulated/floor/tiled/techfloor, /area/ship/ert/dock_star) @@ -6904,7 +6904,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/ert/engine) "XM" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ pixel_x = 24 }, diff --git a/_maps/templates/admin/kk_mercship.dmm b/_maps/templates/admin/kk_mercship.dmm index ebcc4637cd9..7cea3749460 100644 --- a/_maps/templates/admin/kk_mercship.dmm +++ b/_maps/templates/admin/kk_mercship.dmm @@ -2332,7 +2332,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_aft) "lg" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ id_tag = "merc_port"; @@ -4248,9 +4248,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_star) "uN" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ pixel_y = 24 }, @@ -4528,7 +4528,7 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/hallways_port) "vV" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ id_tag = "merc_star"; @@ -5369,8 +5369,8 @@ /area/ship/manta/holding) "yT" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior{ dir = 6; pixel_x = 7; @@ -6229,9 +6229,9 @@ /turf/simulated/floor/tiled/techfloor, /area/ship/manta/armoury_as) "Di" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ pixel_y = 24 }, @@ -6946,8 +6946,8 @@ /area/ship/manta/dock_star) "Ha" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior{ dir = 10; pixel_x = -8; @@ -7669,7 +7669,7 @@ /area/ship/manta/recreation) "KI" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/effect/floor_decal/techfloor{ dir = 1 }, @@ -8391,7 +8391,7 @@ /obj/machinery/airlock_sensor{ pixel_y = -23 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/techfloor{ dir = 6 }, @@ -9508,7 +9508,7 @@ /obj/machinery/airlock_sensor{ pixel_y = -23 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/techfloor{ dir = 10 }, @@ -10567,7 +10567,7 @@ /area/ship/manta/bridge) "YZ" = ( /obj/machinery/door/airlock/external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/effect/floor_decal/techfloor, /obj/effect/floor_decal/techfloor{ dir = 1 diff --git a/_maps/templates/shuttles/overmaps/generic/bearcat.dmm b/_maps/templates/shuttles/overmaps/generic/bearcat.dmm index dddae52494a..8d3485c2d87 100644 --- a/_maps/templates/shuttles/overmaps/generic/bearcat.dmm +++ b/_maps/templates/shuttles/overmaps/generic/bearcat.dmm @@ -559,18 +559,18 @@ /turf/simulated/floor/plating, /area/shuttle/bearcat/unused2) "bo" = ( -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -6; pixel_y = 24 }, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/door/airlock/glass_external/public, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/dock_port) "bp" = ( -/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/atom/movable/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/dock_port) @@ -581,12 +581,12 @@ /turf/simulated/wall/rshull, /area/shuttle/bearcat/dock_starboard) "br" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; icon_state = "map_vent" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor/airlock_interior{ pixel_x = -8; pixel_y = 26 @@ -601,7 +601,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/dock_port) "bs" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -677,7 +677,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/dock_starboard) "bC" = ( -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -685,13 +685,13 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/dock_starboard) "bD" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; id_tag = "expshuttle_docker_pump_out_external" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor/airlock_interior{ pixel_x = 8; pixel_y = 26 @@ -706,7 +706,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/bearcat/dock_starboard) "bF" = ( -/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/atom/movable/map_helper/airlock/atmos/pump_out_internal, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume, /obj/effect/shuttle_landmark/shuttle_initializer/bearcat, /obj/effect/overmap/visitable/ship/landable/bearcat, @@ -720,8 +720,8 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/bearcat/dock_starboard) "bH" = ( -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 6; @@ -735,7 +735,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/light{ dir = 8 }, @@ -846,7 +846,7 @@ /turf/simulated/floor/airless, /area/shuttle/bearcat/crew_toilets) "ca" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/airlock_sensor{ pixel_x = 26 }, @@ -3261,7 +3261,7 @@ /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_power) "gX" = ( -/obj/effect/map_helper/airlock/atmos/pump_out_external, +/atom/movable/map_helper/airlock/atmos/pump_out_external, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1 }, @@ -3290,7 +3290,7 @@ /turf/simulated/floor/plating, /area/shuttle/bearcat/maintenance_engine) "hc" = ( -/obj/effect/map_helper/airlock/atmos/pump_out_external, +/atom/movable/map_helper/airlock/atmos/pump_out_external, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 1 }, diff --git a/_maps/templates/shuttles/overmaps/generic/gecko_cr.dmm b/_maps/templates/shuttles/overmaps/generic/gecko_cr.dmm index d8499da3eec..0a55ec4c6f0 100644 --- a/_maps/templates/shuttles/overmaps/generic/gecko_cr.dmm +++ b/_maps/templates/shuttles/overmaps/generic/gecko_cr.dmm @@ -161,7 +161,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -447,8 +447,8 @@ /area/shuttle/gecko_cr_cockpit) "kd" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -674,7 +674,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -858,8 +858,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/light{ @@ -1249,8 +1249,8 @@ /area/shuttle/gecko_cr_engineering) "yE" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -1302,7 +1302,7 @@ /area/shuttle/gecko_cr_engineering) "zx" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/manifold/hidden, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit) @@ -1419,7 +1419,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -1504,7 +1504,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1966,7 +1966,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -2286,7 +2286,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ @@ -2346,7 +2346,7 @@ "PD" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden, /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/gecko_cr_cockpit) "PI" = ( @@ -2608,8 +2608,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/light{ @@ -2925,7 +2925,7 @@ /area/shuttle/gecko_cr_engineering) "Yj" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ @@ -2939,7 +2939,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, diff --git a/_maps/templates/shuttles/overmaps/generic/gecko_sh.dmm b/_maps/templates/shuttles/overmaps/generic/gecko_sh.dmm index efee63f9a43..48e157d46f5 100644 --- a/_maps/templates/shuttles/overmaps/generic/gecko_sh.dmm +++ b/_maps/templates/shuttles/overmaps/generic/gecko_sh.dmm @@ -210,7 +210,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -465,8 +465,8 @@ /area/shuttle/gecko_sh) "kd" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -662,7 +662,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -773,8 +773,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/light{ @@ -1186,8 +1186,8 @@ /area/shuttle/gecko_sh) "yE" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/sensor/ext_sensor, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -1220,7 +1220,7 @@ /area/shuttle/gecko_sh_engineering) "zx" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 }, @@ -1354,7 +1354,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -1445,7 +1445,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning{ dir = 1 }, @@ -1848,7 +1848,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 1 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, @@ -2097,7 +2097,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ @@ -2141,7 +2141,7 @@ /area/shuttle/gecko_sh) "PD" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 9 }, @@ -2383,8 +2383,8 @@ /obj/machinery/airlock_sensor{ pixel_y = 21 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/light{ @@ -2634,7 +2634,7 @@ /area/shuttle/gecko_sh_engineering) "Yj" = ( /obj/effect/floor_decal/industrial/warning/corner, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump, /obj/structure/handrail, /obj/machinery/embedded_controller/radio/airlock/docking_port_multi{ @@ -2651,7 +2651,7 @@ /obj/effect/floor_decal/industrial/warning/corner{ dir = 4 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, diff --git a/_maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm b/_maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm index 2896c379d82..06624787ad9 100644 --- a/_maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm +++ b/_maps/templates/shuttles/overmaps/generic/generic_shuttle.dmm @@ -624,7 +624,7 @@ /area/shuttle/generic_shuttle/gen) "bo" = ( /obj/machinery/door/airlock/glass_external, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/plating, /area/shuttle/generic_shuttle/gen) "bp" = ( @@ -633,7 +633,7 @@ frequency = 1380; id_tag = "expshuttle_vent" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "generic_shuttle_docker"; @@ -652,8 +652,8 @@ frequency = 1380; id_tag = "expshuttle_vent" }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ pixel_y = 28 }, @@ -669,7 +669,7 @@ icon_state = "4-8"; pixel_x = 0 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; diff --git a/_maps/templates/shuttles/overmaps/generic/itglight.dmm b/_maps/templates/shuttles/overmaps/generic/itglight.dmm index 386e5e88cbf..a53e1b021fa 100644 --- a/_maps/templates/shuttles/overmaps/generic/itglight.dmm +++ b/_maps/templates/shuttles/overmaps/generic/itglight.dmm @@ -226,7 +226,7 @@ id_tag = "itglightshuttle_docker_hatch"; name = "Shuttle Hatch" }, -/obj/effect/map_helper/airlock/door/simple, +/atom/movable/map_helper/airlock/door/simple, /obj/structure/cable/pink{ d1 = 4; d2 = 8; @@ -2011,8 +2011,8 @@ /turf/simulated/floor, /area/itglight/portengi) "lV" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "itglight_port_sensor"; @@ -2248,7 +2248,7 @@ /turf/simulated/floor, /area/itglight/starboardengi) "nR" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 1; frequency = 1380; @@ -3316,7 +3316,7 @@ /turf/simulated/floor/tiled/dark, /area/itglight/passengersleeping) "wt" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/embedded_controller/radio/airlock/docking_port{ dir = 1; frequency = 1380; @@ -3527,7 +3527,7 @@ /turf/simulated/floor/tiled/steel_ridged, /area/itglight/lockers) "xj" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1380; @@ -3709,7 +3709,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, @@ -3810,7 +3810,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/starboardcargo) "yT" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1380; @@ -3918,7 +3918,7 @@ /turf/space, /area/itglight/portengi) "zG" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1380; @@ -4130,8 +4130,8 @@ frequency = 1380; id_tag = "itglight_starboard_pump" }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/airlock_sensor{ frequency = 1380; id_tag = "itglight_starboard_sensor"; @@ -4162,7 +4162,7 @@ /turf/simulated/floor/tiled/monotile, /area/itglight/lockers) "Bj" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1380; @@ -4294,7 +4294,7 @@ /area/itglight/porthighsec) "Ca" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/external{ frequency = 1380; icon_state = "door_locked"; @@ -4487,7 +4487,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1380; @@ -4748,7 +4748,7 @@ /area/itglight/forehall) "EC" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/structure/cable/pink{ d1 = 4; d2 = 8; @@ -4938,7 +4938,7 @@ /area/itglight/portengi) "Fe" = ( /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/door/airlock/external{ frequency = 1380; icon_state = "door_locked"; @@ -5108,7 +5108,7 @@ frequency = 1380; id_tag = "itglight_starboard_inner" }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/access_button{ command = "cycle_interior"; frequency = 1380; @@ -5244,7 +5244,7 @@ /turf/simulated/floor/tiled/eris/steel/gray_platform, /area/itglight/portcargo) "GI" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -5367,7 +5367,7 @@ /turf/simulated/floor, /area/itglight/readyroom) "HD" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -5415,7 +5415,7 @@ /turf/simulated/floor, /area/itglight/portengi) "HN" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 4; frequency = 1380; @@ -5448,7 +5448,7 @@ /turf/simulated/floor, /area/itglight/portengi) "HR" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -5463,7 +5463,7 @@ /turf/simulated/floor, /area/itglight/starboardengi) "HW" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -5524,7 +5524,7 @@ id_tag = "itglight_dock_1_sensor"; pixel_y = -25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/structure/catwalk, /turf/simulated/floor, /area/itglight/portdocking) @@ -5584,7 +5584,7 @@ id_tag = "itglight_dock_2_sensor"; pixel_y = -25 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/structure/catwalk, /turf/simulated/floor, /area/itglight/starboarddocking) @@ -5622,7 +5622,7 @@ id_tag = "itglight_starboard_outer"; name = "Starboard Solars External Airlock" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; @@ -5637,7 +5637,7 @@ /turf/simulated/floor/tiled/eris/steel/brown_platform, /area/itglight/common) "Jk" = ( -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/atmospherics/component/unary/vent_pump/high_volume{ dir = 8; frequency = 1380; @@ -7722,7 +7722,7 @@ /obj/structure/cable/heavyduty{ icon_state = "4-8" }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm b/_maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm index 9a93ac914f3..aa5191e9904 100644 --- a/_maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm +++ b/_maps/templates/shuttles/overmaps/generic/mackerel_hc.dmm @@ -166,8 +166,8 @@ /area/shuttle/mackerel_hc) "mw" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -359,8 +359,8 @@ /area/shuttle/mackerel_hc) "zY" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -464,8 +464,8 @@ dir = 1 }, /obj/structure/handrail, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -632,7 +632,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, @@ -669,8 +669,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -765,7 +765,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner, /obj/machinery/light{ dir = 4 @@ -875,7 +875,7 @@ "ZK" = ( /obj/machinery/door/airlock/hatch, /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_hc) "ZZ" = ( diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm b/_maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm index 8ac5cb6edc1..00e929246d9 100644 --- a/_maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm +++ b/_maps/templates/shuttles/overmaps/generic/mackerel_hc_skel.dmm @@ -96,8 +96,8 @@ /area/shuttle/mackerel_hc_skel_cockpit) "eh" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -247,8 +247,8 @@ /area/shuttle/mackerel_hc_skel) "mw" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -636,8 +636,8 @@ dir = 1 }, /obj/structure/handrail, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -788,7 +788,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/light{ dir = 8 }, @@ -861,8 +861,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -918,7 +918,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/light{ dir = 4 }, @@ -1084,7 +1084,7 @@ "ZK" = ( /obj/machinery/door/airlock/hatch, /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_hc_skel) diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm b/_maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm index 36e432584c8..b8334dfa88c 100644 --- a/_maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm +++ b/_maps/templates/shuttles/overmaps/generic/mackerel_lc.dmm @@ -183,8 +183,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 @@ -224,8 +224,8 @@ /area/shuttle/mackerel_lc) "pZ" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -295,7 +295,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/railing/grey, /obj/random/multiple/corp_crate, @@ -500,8 +500,8 @@ /area/shuttle/mackerel_lc) "FL" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -641,7 +641,7 @@ "PL" = ( /obj/machinery/door/airlock/hatch, /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_lc) "Qu" = ( @@ -699,7 +699,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, @@ -718,8 +718,8 @@ dir = 1 }, /obj/structure/handrail, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ dir = 4 diff --git a/_maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm b/_maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm index 9e39d9b71f7..64d819947c9 100644 --- a/_maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm +++ b/_maps/templates/shuttles/overmaps/generic/mackerel_sh.dmm @@ -186,8 +186,8 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 1 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/machinery/airlock_sensor{ pixel_x = -8; pixel_y = 21 @@ -227,8 +227,8 @@ /area/shuttle/mackerel_sh) "pZ" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 10; pixel_x = -8; @@ -306,7 +306,7 @@ /obj/machinery/airlock_sensor{ pixel_x = 26 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner, /obj/structure/railing/grey, /turf/simulated/floor/tiled/techfloor, @@ -523,8 +523,8 @@ /area/shuttle/mackerel_sh) "FL" = ( /obj/machinery/door/airlock/hatch, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 6; pixel_x = 7; @@ -692,7 +692,7 @@ "PL" = ( /obj/machinery/door/airlock/hatch, /obj/machinery/door/firedoor/glass, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/mackerel_sh) "Qu" = ( @@ -759,7 +759,7 @@ /obj/machinery/airlock_sensor{ pixel_x = -25 }, -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/effect/floor_decal/industrial/warning/corner{ dir = 8 }, @@ -777,8 +777,8 @@ dir = 1 }, /obj/structure/handrail, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/effect/overmap/visitable/ship/landable/mackerel_sh, /obj/machinery/light, /obj/effect/floor_decal/industrial/warning{ diff --git a/_maps/templates/shuttles/overmaps/generic/salamander.dmm b/_maps/templates/shuttles/overmaps/generic/salamander.dmm index f3e69847fb2..5a253ee4a1c 100644 --- a/_maps/templates/shuttles/overmaps/generic/salamander.dmm +++ b/_maps/templates/shuttles/overmaps/generic/salamander.dmm @@ -1,14 +1,14 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "ab" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "aK" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ dir = 1; pixel_x = 24; @@ -46,7 +46,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_head) "bu" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/machinery/airlock_sensor{ dir = 4; @@ -181,7 +181,7 @@ /area/shuttle/salamander_head) "cX" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /obj/machinery/atmospherics/pipe/simple/hidden/fuel, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) @@ -269,7 +269,7 @@ /turf/simulated/floor/tiled/techfloor, /area/shuttle/salamander_q2) "eJ" = ( -/obj/effect/map_helper/airlock/sensor/int_sensor, +/atom/movable/map_helper/airlock/sensor/int_sensor, /obj/machinery/airlock_sensor{ dir = 8; pixel_x = 21; @@ -880,8 +880,8 @@ /area/shuttle/salamander_engineering) "mg" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/ext_door, -/obj/effect/map_helper/airlock/sensor/ext_sensor, +/atom/movable/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/sensor/ext_sensor, /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ pixel_x = 24; pixel_y = -11 @@ -1009,7 +1009,7 @@ /area/shuttle/salamander) "oe" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "oi" = ( @@ -1088,7 +1088,7 @@ /obj/machinery/atmospherics/component/unary/vent_pump{ dir = 8 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/closet/walllocker/emerglocker/east, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) @@ -1537,7 +1537,7 @@ /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "Kw" = ( -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, @@ -1793,7 +1793,7 @@ /area/shuttle/salamander) "UT" = ( /obj/machinery/door/airlock/glass_external/public, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techmaint, /area/shuttle/salamander) "Vh" = ( diff --git a/_maps/templates/shuttles/overmaps/generic/shelter_5.dmm b/_maps/templates/shuttles/overmaps/generic/shelter_5.dmm index d6f698ca829..4181a2f0e13 100644 --- a/_maps/templates/shuttles/overmaps/generic/shelter_5.dmm +++ b/_maps/templates/shuttles/overmaps/generic/shelter_5.dmm @@ -79,7 +79,7 @@ id_tag = "escapepod_shuttle_docker"; pixel_y = 28 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/handrail{ dir = 8 }, @@ -87,7 +87,7 @@ frequency = 1380; pixel_y = 22 }, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/light/small{ dir = 8; pixel_x = 0 @@ -135,7 +135,7 @@ /obj/effect/floor_decal/industrial/warning{ dir = 4 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/steel_ridged, /area/shuttle/deployable/escapepod) "o" = ( @@ -150,7 +150,7 @@ icon_state = "warning"; dir = 8 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; diff --git a/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm b/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm index a3b0b6c42fc..9176bafcd15 100644 --- a/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm +++ b/_maps/templates/shuttles/overmaps/generic/shelter_6.dmm @@ -527,7 +527,7 @@ pixel_x = -5; pixel_y = -26 }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/tabiranth) "aE" = ( @@ -545,8 +545,8 @@ frequency = 1380; pixel_y = 25 }, -/obj/effect/map_helper/airlock/atmos/chamber_pump, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, /obj/machinery/light/small{ dir = 1 }, @@ -664,7 +664,7 @@ pixel_x = 5; pixel_y = 26 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/tabiranth) "aL" = ( @@ -682,7 +682,7 @@ pixel_x = -5; pixel_y = 26 }, -/obj/effect/map_helper/airlock/door/int_door, +/atom/movable/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/techfloor/grid, /area/shuttle/tabiranth) "aM" = ( @@ -1548,8 +1548,8 @@ }, /obj/effect/shuttle_landmark/shuttle_initializer/tabiranth, /obj/effect/overmap/visitable/ship/landable/tabiranth, -/obj/effect/map_helper/airlock/sensor/chamber_sensor, -/obj/effect/map_helper/airlock/atmos/chamber_pump, +/atom/movable/map_helper/airlock/sensor/chamber_sensor, +/atom/movable/map_helper/airlock/atmos/chamber_pump, /obj/structure/handrail{ dir = 1 }, @@ -1693,7 +1693,7 @@ /obj/machinery/door/airlock/alien/blue/locked{ req_one_access = list(101) }, -/obj/effect/map_helper/airlock/door/ext_door, +/atom/movable/map_helper/airlock/door/ext_door, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; diff --git a/code/__DEFINES/directional.dm b/code/__DEFINES/directional.dm index bfde544b447..987c794394f 100644 --- a/code/__DEFINES/directional.dm +++ b/code/__DEFINES/directional.dm @@ -33,3 +33,13 @@ dir = WEST; \ pixel_x = -offset; \ } + +// each dir plus diagonals in its own bit +#define NORTH_BIT NORTH +#define SOUTH_BIT SOUTH +#define EAST_BIT EAST +#define WEST_BIT WEST +#define NORTHEAST_BIT (1<<4) +#define NORTHWEST_BIT (1<<5) +#define SOUTHEAST_BIT (1<<6) +#define SOUTHWEST_BIT (1<<7) diff --git a/code/game/machinery/embedded_controller/mapping_helpers.dm b/code/game/machinery/embedded_controller/mapping_helpers.dm index 542fd5b84e5..69e73b52f55 100644 --- a/code/game/machinery/embedded_controller/mapping_helpers.dm +++ b/code/game/machinery/embedded_controller/mapping_helpers.dm @@ -6,7 +6,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 */ -/obj/effect/map_helper/airlock +/atom/movable/map_helper/airlock name = "use a subtype!" icon = 'icons/misc/map_helpers.dmi' plane = 20 //I dunno just high. @@ -21,7 +21,7 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 //Most things have a radio tag of some sort that needs adjusting var/tag_addon -/obj/effect/map_helper/airlock/Initialize(mapload) +/atom/movable/map_helper/airlock/Initialize(mapload) ..() my_controller = get_controller(get_area(src)) my_device = locate(my_device_type) in get_turf(src) @@ -35,12 +35,12 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 setup() return INITIALIZE_HINT_QDEL -/obj/effect/map_helper/airlock/Destroy() +/atom/movable/map_helper/airlock/Destroy() my_controller = null my_device = null return ..() -/obj/effect/map_helper/airlock/proc/get_controller(var/area/A) +/atom/movable/map_helper/airlock/proc/get_controller(var/area/A) if(!A) return null @@ -71,35 +71,35 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 return closest -/obj/effect/map_helper/airlock/proc/setup() +/atom/movable/map_helper/airlock/proc/setup() return //Stub for subtypes /* Doors */ -/obj/effect/map_helper/airlock/door +/atom/movable/map_helper/airlock/door name = "use a subtype! - airlock door" my_device_type = /obj/machinery/door/airlock -/obj/effect/map_helper/airlock/door/setup() +/atom/movable/map_helper/airlock/door/setup() var/obj/machinery/door/airlock/my_airlock = my_device my_airlock.lock() my_airlock.id_tag = my_controller.id_tag + tag_addon my_airlock.frequency = my_controller.frequency my_airlock.set_frequency(my_controller.frequency) -/obj/effect/map_helper/airlock/door/ext_door +/atom/movable/map_helper/airlock/door/ext_door name = "exterior airlock door" icon_state = "doorout" tag_addon = "_outer" -/obj/effect/map_helper/airlock/door/int_door +/atom/movable/map_helper/airlock/door/int_door name = "interior airlock door" icon_state = "doorin" tag_addon = "_inner" -/obj/effect/map_helper/airlock/door/simple +/atom/movable/map_helper/airlock/door/simple name = "simple docking controller hatch" icon_state = "doorsimple" tag_addon = "_hatch" @@ -109,26 +109,26 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 /* Atmos */ -/obj/effect/map_helper/airlock/atmos +/atom/movable/map_helper/airlock/atmos name = "use a subtype! - airlock pump" my_device_type = /obj/machinery/atmospherics/component/unary/vent_pump -/obj/effect/map_helper/airlock/atmos/setup() +/atom/movable/map_helper/airlock/atmos/setup() var/obj/machinery/atmospherics/component/unary/vent_pump/my_pump = my_device my_pump.frequency = my_controller.frequency //Unlike doors, these set up their radios in atmos init, so they won't have gone before us. my_pump.id_tag = my_controller.id_tag + tag_addon -/obj/effect/map_helper/airlock/atmos/chamber_pump +/atom/movable/map_helper/airlock/atmos/chamber_pump name = "chamber pump" icon_state = "pump" tag_addon = "_pump" -/obj/effect/map_helper/airlock/atmos/pump_out_internal +/atom/movable/map_helper/airlock/atmos/pump_out_internal name = "air dump intake" icon_state = "pumpdin" tag_addon = "_pump_out_internal" -/obj/effect/map_helper/airlock/atmos/pump_out_external +/atom/movable/map_helper/airlock/atmos/pump_out_external name = "air dump output" icon_state = "pumpdout" tag_addon = "_pump_out_external" @@ -137,12 +137,12 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 /* Sensors - did you know they function as buttons? You don't also need a button. */ -/obj/effect/map_helper/airlock/sensor +/atom/movable/map_helper/airlock/sensor name = "use a subtype! - airlock sensor" my_device_type = /obj/machinery/airlock_sensor var/command -/obj/effect/map_helper/airlock/sensor/setup() +/atom/movable/map_helper/airlock/sensor/setup() var/obj/machinery/airlock_sensor/my_sensor = my_device my_sensor.id_tag = my_controller.id_tag + tag_addon my_sensor.master_tag = my_controller.id_tag @@ -151,19 +151,19 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 if(command) my_sensor.command = command -/obj/effect/map_helper/airlock/sensor/ext_sensor +/atom/movable/map_helper/airlock/sensor/ext_sensor name = "exterior sensor" icon_state = "sensout" tag_addon = "_exterior_sensor" command = "cycle_exterior" -/obj/effect/map_helper/airlock/sensor/chamber_sensor +/atom/movable/map_helper/airlock/sensor/chamber_sensor name = "chamber sensor" icon_state = "sens" tag_addon = "_sensor" command = "cycle" -/obj/effect/map_helper/airlock/sensor/int_sensor +/atom/movable/map_helper/airlock/sensor/int_sensor name = "interior sensor" icon_state = "sensin" tag_addon = "_interior_sensor" @@ -173,5 +173,5 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 Buttons */ -/obj/effect/map_helper/airlock/buttons +/atom/movable/map_helper/airlock/buttons name = "Just use a sensor instead. They are actually buttons." diff --git a/code/modules/mapping/map_helpers/_map_helpers.dm b/code/modules/mapping/map_helpers/_map_helpers.dm index c52c2340598..eb97a20abd2 100644 --- a/code/modules/mapping/map_helpers/_map_helpers.dm +++ b/code/modules/mapping/map_helpers/_map_helpers.dm @@ -1,24 +1,24 @@ //Landmarks and other helpers which speed up the mapping process and reduce the number of unique instances/subtypes of items/turf/ect -/obj/effect/map_helper +/atom/movable/map_helper icon = 'icons/mapping/helpers/mapping_helpers.dmi' icon_state = "" var/late = FALSE -/obj/effect/map_helper/Initialize(mapload) +/atom/movable/map_helper/Initialize(mapload) . = ..() return late ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_QDEL -/* +/* these need renaming because airlock already exist! //airlock helpers -/obj/effect/map_helper/airlock +/atom/movable/map_helper/airlock layer = DOOR_HELPER_LAYER -/obj/effect/map_helper/airlock/cyclelink_helper +/atom/movable/map_helper/airlock/cyclelink_helper name = "airlock cyclelink helper" icon_state = "airlock_cyclelink_helper" -/obj/effect/map_helper/airlock/cyclelink_helper/Initialize(mapload) +/atom/movable/map_helper/airlock/cyclelink_helper/Initialize(mapload) . = ..() if(!mapload) log_mapping("[src] spawned outside of mapload!") @@ -33,11 +33,11 @@ log_mapping("[src] failed to find an airlock at [AREACOORD(src)]") -/obj/effect/map_helper/airlock/locked +/atom/movable/map_helper/airlock/locked name = "airlock lock helper" icon_state = "airlock_locked_helper" -/obj/effect/map_helper/airlock/locked/Initialize(mapload) +/atom/movable/map_helper/airlock/locked/Initialize(mapload) . = ..() if(!mapload) log_mapping("[src] spawned outside of mapload!") @@ -51,11 +51,11 @@ else log_mapping("[src] failed to find an airlock at [AREACOORD(src)]") -/obj/effect/map_helper/airlock/unres +/atom/movable/map_helper/airlock/unres name = "airlock unresctricted side helper" icon_state = "airlock_unres_helper" -/obj/effect/map_helper/airlock/unres/Initialize(mapload) +/atom/movable/map_helper/airlock/unres/Initialize(mapload) . = ..() if(!mapload) log_mapping("[src] spawned outside of mapload!") @@ -68,19 +68,19 @@ //needs to do its thing before spawn_rivers() is called -INITIALIZE_IMMEDIATE(/obj/effect/map_helper/no_lava) +INITIALIZE_IMMEDIATE(/atom/movable/map_helper/no_lava) -/obj/effect/map_helper/no_lava +/atom/movable/map_helper/no_lava icon_state = "no_lava" -/obj/effect/map_helper/no_lava/Initialize(mapload) +/atom/movable/map_helper/no_lava/Initialize(mapload) . = ..() var/turf/T = get_turf(src) T.flags_1 |= NO_LAVA_GEN */ //This helper applies components to things on the map directly. -/obj/effect/map_helper/component_injector +/atom/movable/map_helper/component_injector name = "Component Injector" late = TRUE var/target_type @@ -88,7 +88,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/map_helper/no_lava) var/component_type //Late init so everything is likely ready and loaded (no warranty) -/obj/effect/map_helper/component_injector/LateInitialize() +/atom/movable/map_helper/component_injector/LateInitialize() if(!ispath(component_type,/datum/component)) CRASH("Wrong component type in [type] - [component_type] is not a component") var/turf/T = get_turf(src) @@ -104,17 +104,17 @@ INITIALIZE_IMMEDIATE(/obj/effect/map_helper/no_lava) qdel(src) return -/obj/effect/map_helper/component_injector/proc/build_args() +/atom/movable/map_helper/component_injector/proc/build_args() return list(component_type) /* -/obj/effect/map_helper/component_injector/infective +/atom/movable/map_helper/component_injector/infective name = "Infective Injector" icon_state = "component_infective" component_type = /datum/component/infective var/disease_type -/obj/effect/map_helper/component_injector/infective/build_args() +/atom/movable/map_helper/component_injector/infective/build_args() if(!ispath(disease_type,/datum/disease)) CRASH("Wrong disease type passed in.") var/datum/disease/D = new disease_type() diff --git a/code/modules/mapping/map_helpers/network_builder/_network_builder.dm b/code/modules/mapping/map_helpers/network_builder/_network_builder.dm index 994d11e5910..561e11b3b0a 100644 --- a/code/modules/mapping/map_helpers/network_builder/_network_builder.dm +++ b/code/modules/mapping/map_helpers/network_builder/_network_builder.dm @@ -1,41 +1,57 @@ -//Builds networks like power cables/atmos lines/etc -//Just a holder parent type for now.. -/obj/effect/map_helper/network_builder - /// set var to true to not del on lateload - var/custom_spawned = FALSE - +// Builds networks like power cables/atmos lines/etc +// Just a holder parent type for now.. +/atom/movable/map_helper/network_builder icon = 'icons/mapping/helpers/mapping_helpers.dmi' - late = TRUE - /// what directions we know connections are in - var/list/network_directions = list() + invisibility = INVISIBILITY_MAXIMUM + /// what directions we know connections are in. flag. uses X_BIT defines! + var/network_directions + /// adminspawned + var/adminspawned = FALSE + /// our base type + var/base_type -/obj/effect/map_helper/network_builder/Initialize(mapload) +/atom/movable/map_helper/network_builder/Initialize(mapload) . = ..() - var/conflict = check_duplicates() - if(conflict) - stack_trace("WARNING: [type] network building helper found check_duplicates() conflict [conflict] in its location.!") - return INITIALIZE_HINT_QDEL if(!mapload) - if(GLOB.Debug2) - custom_spawned = TRUE - return INITIALIZE_HINT_NORMAL - else - return INITIALIZE_HINT_QDEL + /// if it isn't adminspawned i am going to come find you + /// don't anyone dare use this in non mapping contexts + /// "teardown and rebuild" behavior is garbage, don't use it. + adminspawned = TRUE + rebuild() + return INITIALIZE_HINT_NORMAL + var/conflict = length(duplicates()) + if(conflict) + stack_trace("WARNING: [type] network building helper found check_duplicates() conflicts [english_list(conflict)] in its location.!") + return INITIALIZE_HINT_QDEL + network_directions = scan() return INITIALIZE_HINT_LATELOAD /// How this works: On LateInitialize, detect all directions that this should be applicable to, and do what it needs to do, and then inform all network builders in said directions that it's been around since it won't be around afterwards. -/obj/effect/map_helper/network_builder/LateInitialize() - scan_directions() - build_network() - if(!custom_spawned) - qdel(src) +/atom/movable/map_helper/network_builder/LateInitialize() + build() + qdel(src) -/obj/effect/map_helper/network_builder/proc/check_duplicates() +/atom/movable/map_helper/network_builder/proc/duplicates() CRASH("Base abstract network builder tried to check duplicates.") -/obj/effect/map_helper/network_builder/proc/scan_directions() +/atom/movable/map_helper/network_builder/proc/scan() CRASH("Base abstract network builder tried to scan directions.") -/obj/effect/map_helper/network_builder/proc/build_network() +/atom/movable/map_helper/network_builder/proc/build() CRASH("Base abstract network builder tried to build network.") + +/atom/movable/map_helper/network_builder/proc/teardown() + for(var/atom/movable/AM as anything in duplicates()) + ASSERT(istype(AM)) + qdel(AM) + +/atom/movable/map_helper/network_builder/proc/rebuild(propagate = TRUE) + teardown() + if(propagate) + for(var/d in GLOB.cardinal) + var/atom/movable/map_helper/network_builder/NB = locate(base_type) in get_step(src, d) + if(NB) + NB.rebuild(FALSE) + network_directions = scan() + build() diff --git a/code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm b/code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm deleted file mode 100644 index 811913ec970..00000000000 --- a/code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm +++ /dev/null @@ -1,96 +0,0 @@ -/* Automatically places pipes on init based on any pipes connecting to it and adjacent helpers. Only supports cardinals. - * Conflicts with ANY PIPE ON ITS LAYER, as well as atmos network build helpers on the same layer, as well as any pipe on all layers. Do those manually. -*/ -/obj/effect/map_helper/network_builder/atmos_pipe - name = "atmos pipe autobuilder" - icon_state = "atmospipebuilder" - - /// Layer to put our pipes on - var/pipe_layer = PIPING_LAYER_DEFAULT - - /// Color to set our pipes to - var/pipe_color - - /// Whether or not pipes we make are visible - var/visible_pipes = FALSE - - color = null - -/obj/effect/map_helper/network_builder/atmos_pipe/check_duplicates() - for(var/obj/effect/map_helper/network_builder/atmos_pipe/other in loc) - if(other == src) - continue - if(other.pipe_layer == pipe_layer) - return other - for(var/obj/machinery/atmospherics/A in loc) - if(A.pipe_flags & PIPING_ALL_LAYER) - return A - if(A.piping_layer == pipe_layer) - return A - return FALSE - -/// Scans directions, sets network_directions to have every direction that we can link to. If there's another power cable builder detected, make sure they know we're here by adding us to their cable directions list before we're deleted. -/obj/effect/map_helper/network_builder/atmos_pipe/scan_directions() - var/turf/T - for(var/i in GLOB.cardinals) - if(i in network_directions) - continue //we're already set, that means another builder set us. - T = get_step(loc, i) - if(!T) - continue - var/found = FALSE - for(var/obj/effect/map_helper/network_builder/atmos_pipe/other in T) - if(other.pipe_layer == pipe_layer) - network_directions += i - other.network_directions += turn(i, 180) - found = TRUE - break - if(found) - continue - for(var/obj/machinery/atmospherics/A in T) - if((A.piping_layer == pipe_layer) && (A.initialize_directions & turn(i, 180))) - network_directions += i - break - return network_directions - -/// Directions should only ever have cardinals. -/obj/effect/map_helper/network_builder/atmos_pipe/build_network() - if(length(network_directions) <= 1) - return - var/obj/machinery/atmospherics/pipe/built - switch(length(network_directions)) - if(2) //straight pipe - built = new /obj/machinery/atmospherics/pipe/simple(loc) - var/d1 = network_directions[1] - var/d2 = network_directions[2] - var/combined = d1 | d2 - if(combined in GLOB.diagonals) - built.setDir(combined) - else - built.setDir(d1) - if(3) //manifold - var/list/missing = network_directions ^ GLOB.cardinals - missing = missing[1] - built = new /obj/machinery/atmospherics/pipe/manifold(loc) - built.setDir(missing) - if(4) //4 way manifold - built = new /obj/machinery/atmospherics/pipe/manifold4w(loc) - built.SetInitDirections() - built.on_construction(pipe_color, pipe_layer) - built.hide(!visible_pipes) - -/obj/effect/map_helper/network_builder/atmos_pipe/distro - name = "distro line autobuilder" - pipe_layer = PIPING_LAYER_MIN - pixel_x = -PIPING_LAYER_P_X - pixel_y = -PIPING_LAYER_P_Y - pipe_color = rgb(130,43,255) - color = rgb(130,43,255) - -/obj/effect/map_helper/network_builder/atmos_pipe/scrubbers - name = "scrubbers line autobuilder" - pipe_layer = PIPING_LAYER_MAX - pixel_x = PIPING_LAYER_P_X - pixel_y = PIPING_LAYER_P_Y - pipe_color = rgb(255,0,0) - color = rgb(255,0,0) diff --git a/code/modules/mapping/map_helpers/network_builder/power_cable.dm b/code/modules/mapping/map_helpers/network_builder/power_cable.dm index 77fddc05468..e9bfffcf858 100644 --- a/code/modules/mapping/map_helpers/network_builder/power_cable.dm +++ b/code/modules/mapping/map_helpers/network_builder/power_cable.dm @@ -3,186 +3,110 @@ #define KNOT_FORCED 2 /// Automatically links on init to power cables and other cable builder helpers. Only supports cardinals. -/obj/effect/map_helper/network_builder/power_cable +/atom/movable/map_helper/network_builder/power_cable name = "power line autobuilder" icon_state = "powerlinebuilder" - + base_type = /atom/movable/map_helper/network_builder/power_cable color = "#ff0000" /// Whether or not we forcefully make a knot var/knot = NO_KNOT - /// cable color as from GLOB.cable_colors var/cable_color = "red" -/obj/effect/map_helper/network_builder/power_cable/check_duplicates() - var/obj/structure/cable/C = locate() in loc - if(C) - return C - for(var/obj/effect/map_helper/network_builder/power_cable/other in loc) - if(other == src) - continue - return other -/// Scans directions, sets network_directions to have every direction that we can link to. If there's another power cable builder detected, make sure they know we're here by adding us to their cable directions list before we're deleted. -/obj/effect/map_helper/network_builder/power_cable/scan_directions() - var/turf/T +/atom/movable/map_helper/network_builder/power_cable/duplicates() + . = list() + for(var/atom/movable/map_helper/network_builder/power_cable/B in loc) + if(B == src) + continue + . += B + for(var/obj/structure/cable/C in loc) + . += C + +/atom/movable/map_helper/network_builder/power_cable/scan() + . = NONE for(var/i in GLOB.cardinal) - if(i in network_directions) - continue //we're already set, that means another builder set us. - T = get_step(loc, i) - if(!T) - continue - var/obj/effect/map_helper/network_builder/power_cable/other = locate() in T - if(other) - network_directions += i - other.network_directions += turn(i, 180) + var/turf/T = get_step(src, i) + if(locate(base_type) in T) + . |= i continue + var/opp = turn(i, 180) for(var/obj/structure/cable/C in T) - if(C.d1 == turn(i, 180) || C.d2 == turn(i, 180)) - network_directions += i + if(C.d1 == opp || C.d2 == opp) + . |= i continue - return network_directions -/// Directions should only ever have cardinals. -/obj/effect/map_helper/network_builder/power_cable/build_network() - if(!length(network_directions)) +/atom/movable/map_helper/network_builder/power_cable/build() + if(!network_directions) return - else if(length(network_directions) == 1) - new /obj/structure/cable(loc, cable_color, NONE, network_directions[1]) + var/knot = KNOT_FORCED || (KNOT_AUTO && detect_knot()) + if(knot) + for(var/i in GLOB.cardinal) + if(!(network_directions & i)) + continue + new /obj/structure/cable(loc, capitalize(cable_color), 0, i, TRUE) else - if(knot == KNOT_FORCED) - for(var/d in network_directions) - new /obj/structure/cable(loc, cable_color, NONE, d) - else - var/do_knot = (knot == KNOT_FORCED) || ((knot == KNOT_AUTO) && should_auto_knot()) - var/dirs = length(network_directions) - for(var/i in 1 to dirs - 1) - var/li = (i == 1)? dirs : (i - 1) - var/d1 = network_directions[i] - var/d2 = network_directions[li] - if(d1 > d2) //this is ugly please help me - d1 = network_directions[li] - d2 = network_directions[i] - new /obj/structure/cable(loc, cable_color, d1, d2) - if(do_knot) - new /obj/structure/cable(loc, cable_color, NONE, network_directions[i]) - do_knot = FALSE + var/last + for(var/i in GLOB.cardinal) + if(!(network_directions & i)) + continue + if(isnull(last)) + last = i + continue + new /obj/structure/cable(loc, capitalize(cable_color), last, i, TRUE) + last = i -/obj/effect/map_helper/network_builder/power_cable/proc/should_auto_knot() - return (locate(/obj/machinery/power/terminal) in loc) +/atom/movable/map_helper/network_builder/power_cable/proc/detect_knot() + return (locate(/obj/machinery/power)) in src -/obj/effect/map_helper/network_builder/power_cable/knot +/atom/movable/map_helper/network_builder/power_cable/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/map_helper/network_builder/power_cable/auto +/atom/movable/map_helper/network_builder/power_cable/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO -// Red -/obj/effect/map_helper/network_builder/power_cable/red - color = "#ff0000" - cable_color = "red" +#define WORK_HARDER_NOT_SMARTER \ + WORK_SMARTER_NOT_HARDER("Red", COLOR_RED) \ + WORK_SMARTER_NOT_HARDER("White", COLOR_WHITE) \ + WORK_SMARTER_NOT_HARDER("Silver", COLOR_SILVER) \ + WORK_SMARTER_NOT_HARDER("Gray", COLOR_GRAY) \ + WORK_SMARTER_NOT_HARDER("Black", COLOR_BLACK) \ + WORK_SMARTER_NOT_HARDER("Maroon", COLOR_MAROON) \ + WORK_SMARTER_NOT_HARDER("Yellow", COLOR_YELLOW) \ + WORK_SMARTER_NOT_HARDER("Olive", COLOR_OLIVE) \ + WORK_SMARTER_NOT_HARDER("Lime", COLOR_LIME) \ + WORK_SMARTER_NOT_HARDER("Green", COLOR_GREEN) \ + WORK_SMARTER_NOT_HARDER("Cyan", COLOR_CYAN) \ + WORK_SMARTER_NOT_HARDER("Teal", COLOR_TEAL) \ + WORK_SMARTER_NOT_HARDER("Blue", COLOR_BLUE) \ + WORK_SMARTER_NOT_HARDER("Navy", COLOR_NAVY) \ + WORK_SMARTER_NOT_HARDER("Pink", COLOR_PINK) \ + WORK_SMARTER_NOT_HARDER("Purple", COLOR_PURPLE) \ + WORK_SMARTER_NOT_HARDER("Orange", COLOR_ORANGE) \ + WORK_SMARTER_NOT_HARDER("Beige", COLOR_BEIGE) \ + WORK_SMARTER_NOT_HARDER("Brown", COLOR_BROWN) -/obj/effect/map_helper/network_builder/power_cable/red/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED +#define WORK_SMARTER_NOT_HARDER(c, v) \ +/atom/movable/map_helper/network_builder/power_cable{ \ + color = v; \ + cable_color = c; \ +} \ +/atom/movable/map_helper/network_builder/power_cable/auto{ \ + color = v; \ + cable_color = c; \ +} \ +/atom/movable/map_helper/network_builder/power_cable/knot{ \ + color = v; \ + cable_color = c; \ +} -/obj/effect/map_helper/network_builder/power_cable/red/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO +WORK_HARDER_NOT_SMARTER // LMAO! -// White -/obj/effect/map_helper/network_builder/power_cable/white - color = "#ffffff" - cable_color = "white" - -/obj/effect/map_helper/network_builder/power_cable/white/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/white/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO - -// Cyan -/obj/effect/map_helper/network_builder/power_cable/cyan - color = "#00ffff" - cable_color = "cyan" - -/obj/effect/map_helper/network_builder/power_cable/cyan/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/cyan/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO - -// Orange -/obj/effect/map_helper/network_builder/power_cable/orange - color = "#ff8000" - cable_color = "orange" - -/obj/effect/map_helper/network_builder/power_cable/orange/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/orange/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO - -// Pink -/obj/effect/map_helper/network_builder/power_cable/pink - color = "#ff3cc8" - cable_color = "pink" - -/obj/effect/map_helper/network_builder/power_cable/pink/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/pink/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO - -// Blue -/obj/effect/map_helper/network_builder/power_cable/blue - color = "#1919c8" - cable_color = "blue" - -/obj/effect/map_helper/network_builder/power_cable/blue/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/blue/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO - -// Green -/obj/effect/map_helper/network_builder/power_cable/green - color = "#00aa00" - cable_color = "green" - -/obj/effect/map_helper/network_builder/power_cable/green/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/green/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO - -// Yellow -/obj/effect/map_helper/network_builder/power_cable/yellow - color = "#ffff00" - cable_color = "yellow" - -/obj/effect/map_helper/network_builder/power_cable/yellow/knot - icon_state = "powerlinebuilderknot" - knot = KNOT_FORCED - -/obj/effect/map_helper/network_builder/power_cable/yellow/auto - icon_state = "powerlinebuilderauto" - knot = KNOT_AUTO +#undef WORK_HARDER_NOT_SMARTER +#undef WORK_SMARTER_NOT_HARDER #undef NO_KNOT #undef KNOT_AUTO diff --git a/code/modules/mapping/spawner/_spawner.dm b/code/modules/mapping/spawner/_spawner.dm new file mode 100644 index 00000000000..365c14b3491 --- /dev/null +++ b/code/modules/mapping/spawner/_spawner.dm @@ -0,0 +1,80 @@ +/** + * our only job is to spawn something and then self-delete + */ +/atom/movable/spawner + icon = 'icons/mapping/spawners/spawners.dmi' + icon_state = "" + layer = MID_LANDMARK_LAYER + /// lateload? + var/late = FALSE + +/atom/movable/spawner/Initialize(mapload) + SHOULD_CALL_PARENT(FALSE) + flags |= INITIALIZED + if(!late) + Spawn() // we always spawn in Initialize(), because if anything we spawn has LateInitialize behavior, that'll be really bad, huh. + // keep in mind though, anything requiring even regular Initialize() behavior will be trampled, so, spawners are only good for + // simple things. + return INITIALIZE_HINT_QDEL + else + // do not use late unless you absolutely know what you're doing + return INITIALIZE_HINT_LATELOAD + +/atom/movable/spawner/LateInitialize() + Spawn() + +/atom/movable/spawner/proc/Spawn() + return + +/** + * simple spawner - spawn a typepath x times + */ +/atom/movable/spawner/simple + var/path + var/amount + +/atom/movable/spawner/simple/Spawn() + for(var/i in 1 to min(50, amount)) + new path(loc) + +/** + * multi spawner - spawn a typepath x times for paths in list + * paths can be text as **byond params**, not json. + */ +/atom/movable/spawner/multi + var/list/paths + +/atom/movable/spawner/multi/Spawn() + // check lists + var/list/_paths = list() + // if is text, params2list + if(istext(paths)) + paths = params2list(paths) + if(!islist(paths)) + return + // manual verify + for(var/path in paths) + // first check amount + if(!paths[path]) + paths[path] = 1 + else if(isnum(paths[path])) + if(paths[path] <= 0) + stack_trace("invalid amount [paths[path]] at multi spawner at [AREACOORD(src)]") + continue + else + stack_trace("invalid amount [paths[path]] at multi spawner at [AREACOORD(src)]") + // then type + if(ispath(path)) + _paths[path] = paths[path] + else if(istext(path)) + var/_path = text2path(path) + if(!_path) + stack_trace("invalid path [path] at multi spawner at [AREACOORD(src)]") + _paths[_path] = paths[path] + + else + stack_trace("invalid path [path] at multi spawner at [AREACOORD(src)]") + // spawn + for(var/path in _paths) + for(var/i in 1 to _paths[path]) + new path(loc) diff --git a/code/modules/mapping/spawner/window.dm b/code/modules/mapping/spawner/window.dm new file mode 100644 index 00000000000..07031142d3a --- /dev/null +++ b/code/modules/mapping/spawner/window.dm @@ -0,0 +1,71 @@ +/atom/movable/spawner/window + icon = 'icons/mapping/spawners/windows.dmi' + icon_state = "glass_grille_pane" + late = TRUE + + /// spawn full windows or panes on grille? + var/full_window = FALSE + /// spawn grille at all? + var/spawn_grille = TRUE + /// full window path + var/window_full_path = /obj/structure/window/basic/full + /// pane path + var/window_pane_path = /obj/structure/window/basic + /// found dirs + var/found_dirs = NONE + +/atom/movable/spawner/window/Initialize(mapload) + if(!full_window) + find_dirs() + return ..() + +/atom/movable/spawner/window/proc/find_dirs() + for(var/d in GLOB.cardinal) + var/atom/movable/spawner/window/WS = locate() in get_step(src, d) + if(WS) + found_dirs |= d + +/atom/movable/spawner/window/Spawn() + if(spawn_grille) + new /obj/structure/grille(loc) + if(!full_window) + new window_full_path(loc) + else + // spawn in dirs not in found dirs + var/obj/structure/window/W + for(var/d in GLOB.cardinal) + if(found_dirs & d) + continue + W = new window_pane_path(loc) + W.setDir(d) + +/atom/movable/spawner/window/full + full_window = TRUE + icon_state = "glass_grille_full" + +/atom/movable/spawner/window/reinforced + icon_state = "rglass_grille_pane" + window_pane_path = /obj/structure/window/reinforced + window_full_path = /obj/structure/window/reinforced/full + +/atom/movable/spawner/window/reinforced/full + icon_state = "rglass_grille_full" + full_window = TRUE + +/atom/movable/spawner/window/borosillicate + icon_state = "phoron_grille_pane" + window_pane_path = /obj/structure/window/phoronbasic + window_full_path = /obj/structure/window/phoronbasic/full + +/atom/movable/spawner/window/borosillicate/full + icon_state = "phoron_grille_full" + full_window = TRUE + +/atom/movable/spawner/window/borosillicate/reinforced + icon_state = "rphoron_grille_pane" + window_pane_path = /obj/structure/window/phoronreinforced + window_full_path = /obj/structure/window/phoronreinforced/full + +/atom/movable/spawner/window/borosillicate/reinforced/full + icon_state = "rphoron_grille_full" + full_window = TRUE diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm index f3df9ab2327..a8954e63085 100644 --- a/code/modules/power/cable.dm +++ b/code/modules/power/cable.dm @@ -21,9 +21,9 @@ If d1 = 0 and d2 = dir, it's a O-X cable, getting from the center of the tile to If d1 = dir1 and d2 = dir2, it's a full X-X cable, getting from dir1 to dir2 By design, d1 is the smallest direction and d2 is the highest */ -var/list/possible_cable_coil_colours = list( +GLOBAL_LIST_INIT(possible_cable_coil_colours, list( "White" = COLOR_WHITE, - MAT_SILVER = COLOR_SILVER, + "Silver" = COLOR_SILVER, "Gray" = COLOR_GRAY, "Black" = COLOR_BLACK, "Red" = COLOR_RED, @@ -41,7 +41,7 @@ var/list/possible_cable_coil_colours = list( "Orange" = COLOR_ORANGE, "Beige" = COLOR_BEIGE, "Brown" = COLOR_BROWN - ) + )) /obj/structure/cable level = 1 @@ -67,6 +67,40 @@ var/list/possible_cable_coil_colours = list( return powernet.draw_power(amount) +/obj/structure/cable/Initialize(mapload, _color, _d1, _d2, auto_merge) + . = ..() + + if(_color) + add_atom_colour(GLOB.possible_cable_coil_colours[_color] || COLOR_RED, FIXED_COLOUR_PRIORITY) + + if(_d1 || _d2) + d1 = _d1 + d2 = _d2 + else + // ensure d1 & d2 reflect the icon_state for entering and exiting cable + var/dash = findtext(icon_state, "-") + d1 = text2num( copytext( icon_state, 1, dash ) ) + d2 = text2num( copytext( icon_state, dash+1 ) ) + + var/turf/T = src.loc // hide if turf is not intact + if(level==1) + hide(!T.is_plating()) + cable_list += src //add it to the global cable list + if(auto_merge) + auto_merge() + +// cable refactor when +/obj/structure/cable/proc/auto_merge() + mergeConnectedNetworks(d1) //merge the powernets... + mergeConnectedNetworks(d2) //...in the two new cable directions + mergeConnectedNetworksOnTurf() + + if(d1 & (d1 - 1))// if the cable is layed diagonally, check the others 2 possible directions + mergeDiagonalsNetworks(d1) + + if(d2 & (d2 - 1))// if the cable is layed diagonally, check the others 2 possible directions + mergeDiagonalsNetworks(d2) + /obj/structure/cable/yellow color = COLOR_YELLOW @@ -88,23 +122,6 @@ var/list/possible_cable_coil_colours = list( /obj/structure/cable/white color = COLOR_WHITE -/obj/structure/cable/Initialize(mapload) - . = ..() - - // ensure d1 & d2 reflect the icon_state for entering and exiting cable - - var/dash = findtext(icon_state, "-") - - d1 = text2num( copytext( icon_state, 1, dash ) ) - - d2 = text2num( copytext( icon_state, dash+1 ) ) - - var/turf/T = src.loc // hide if turf is not intact - if(level==1) - hide(!T.is_plating()) - cable_list += src //add it to the global cable list - - /obj/structure/cable/Destroy() // called when a cable is deleted if(powernet) cut_cable_from_powernet() // update the powernets @@ -583,9 +600,9 @@ obj/structure/cable/proc/cableColor(var/colorC) if(!selected_color) return - var/final_color = possible_cable_coil_colours[selected_color] + var/final_color = GLOB.possible_cable_coil_colours[selected_color] if(!final_color) - final_color = possible_cable_coil_colours["Red"] + final_color = GLOB.possible_cable_coil_colours["Red"] selected_color = "red" color = final_color to_chat(user, "You change \the [src]'s color to [lowertext(selected_color)].") @@ -627,7 +644,7 @@ obj/structure/cable/proc/cableColor(var/colorC) set name = "Change Colour" set category = "Object" - var/selected_type = input("Pick new colour.", "Cable Colour", null, null) as null|anything in possible_cable_coil_colours + var/selected_type = input("Pick new colour.", "Cable Colour", null, null) as null|anything in GLOB.possible_cable_coil_colours set_cable_color(selected_type, usr) // Items usable on a cable coil : diff --git a/icons/mapping/spawners/map_effects.dmi b/icons/mapping/spawners/map_effects.dmi deleted file mode 100644 index 0f28f9d2da8e936f2749a39bd4edfe70c083bf2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9181 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 BN?-s0 literal 0 HcmV?d00001 diff --git a/icons/mapping/spawners/windows.dmi b/icons/mapping/spawners/windows.dmi new file mode 100644 index 0000000000000000000000000000000000000000..07a9731a7edd0e280296e45fabf071f654e10119 GIT binary patch literal 6884 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 BZ>|6U literal 0 HcmV?d00001 diff --git a/maps/REGEXING_MAP_PORTS.md b/maps/REGEXING_MAP_PORTS.md index 3eba91f04a9..a722b715ce9 100644 --- a/maps/REGEXING_MAP_PORTS.md +++ b/maps/REGEXING_MAP_PORTS.md @@ -7,16 +7,29 @@ As such we have a *ton* of path replacements. Apply regexes in this order: +`/obj/effect/map_helper`-`/atom/movable/map_helper` + // TODO: tape roll // todo: devices/weapons -// TODO: ADD JOB REGEXES -// TODO: OBSERVER START +// Landmarks +`/obj/effect/landmark`-`/atom/movable/landmark` +// Specific landmarks +`/atom/movable/landmark\{\n\tname = "Observer-Start"\n\t\}`-`/atom/movable/landmark/observer_spawn` +// Preliminary job landmarks +`/atom/movable/landmark/start\{\n\tname = "([A-z]+)"\n\t\}`-`/atom/movable/landmark/spawnpoint/job/\L$1` +`/atom/movable/landmark/start\{\n\tname = "([A-z]+) ([A-z]+)"\n\t\}`-`/atom/movable/landmark/spawnpoint/job/\L$1_\L$2` +`/atom/movable/landmark/start\{\n\tname = "([A-z]+) ([A-z]+) ([A-z]+)"\n\t\}`-`/atom/movable/landmark/spawnpoint/job/\L$1_\L$2_\L$3` +/// Specific job landmarks +`/atom/movable/spawnpoint/job/search_and_rescue`-`/atom/movable/spawnpoint/job/field_medic` +`/atom/movable/spawnpoint/job/facility_director`-`/atom/movable/spawnpoint/job/captain` +`/atom/movable/spawnpoint/job/internal_affairs_agent`-`/atom/movable/spawnpoint/job/lawyer` +`/atom/movable/spawnpoint/job/gardener`-`/atom/movable/spawnpoint/job/botanist` // TODO: MAKE SURE NO / AFTER COSTUME `/atom/movable/landmark/costume`-`/atom/movable/landmark/costume/random` `/atom/movable/landmark/mobcorpse`-`/atom/movable/spawner/corpse` // ATMOSPHERICS -`obj/machinery/atmospherics/omni`-`obj/machinery/atmospherics/component/quaternary` -`obj/machinery/atmospherics/(unary|binary|trinary)`-`obj/machinery/atmospherics/component/$1` +`/obj/machinery/atmospherics/omni`-`/obj/machinery/atmospherics/component/quaternary` +`/obj/machinery/atmospherics/(unary|binary|trinary)`-`/obj/machinery/atmospherics/component/$1` diff --git a/vorestation.dme b/vorestation.dme index 38f4acf60b3..240ed181f96 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -2444,6 +2444,8 @@ #include "code\modules\mapping\space_management\space_transition.dm" #include "code\modules\mapping\space_management\traits.dm" #include "code\modules\mapping\space_management\zlevel_manager.dm" +#include "code\modules\mapping\spawner\_spawner.dm" +#include "code\modules\mapping\spawner\window.dm" #include "code\modules\maps\admin\ert.dm" #include "code\modules\maps\admin\fun.dm" #include "code\modules\maps\admin\mercship.dm"