From d4df3b1d3b3f2ea1076f0198e391c4edba73edbc Mon Sep 17 00:00:00 2001 From: Zandario Date: Mon, 19 Oct 2020 17:12:34 -0500 Subject: [PATCH] Map Helpers Galore --- _maps/map_files/triumph/triumph-02-deck2.dmm | 119 ++- _maps/map_files/triumph/triumph-03-deck3.dmm | 254 +++--- _maps/map_files/triumph/triumph-04-deck4.dmm | 815 ++++++++---------- .../map_files/triumph/triumph-05-flagship.dmm | 29 +- .../_map_helpers.dm} | 34 +- .../airlock.dm | 117 ++- .../baseturf.dm | 0 .../network_builder/_network_builder.dm | 12 +- .../network_builder/atmos_pipe.dm | 16 +- .../network_builder/power_cable.dm | 66 +- icons/map/mapping_helpers.dmi | Bin 8345 -> 8445 bytes icons/obj/airlock_machines.dmi | Bin 1212 -> 5053 bytes maps/nsv_triumph/submaps/triumph_misc.dmm | 23 +- vorestation.dme | 8 +- 14 files changed, 715 insertions(+), 778 deletions(-) rename code/modules/mapping/{mapping_helpers/_mapping_helpers.dm => map_helpers/_map_helpers.dm} (75%) rename code/modules/mapping/{mapping_helpers => map_helpers}/airlock.dm (55%) rename code/modules/mapping/{mapping_helpers => map_helpers}/baseturf.dm (100%) rename code/modules/mapping/{mapping_helpers => map_helpers}/network_builder/_network_builder.dm (76%) rename code/modules/mapping/{mapping_helpers => map_helpers}/network_builder/atmos_pipe.dm (83%) rename code/modules/mapping/{mapping_helpers => map_helpers}/network_builder/power_cable.dm (62%) diff --git a/_maps/map_files/triumph/triumph-02-deck2.dmm b/_maps/map_files/triumph/triumph-02-deck2.dmm index 93bfb93426e..b42d69fb0d2 100644 --- a/_maps/map_files/triumph/triumph-02-deck2.dmm +++ b/_maps/map_files/triumph/triumph-02-deck2.dmm @@ -147,8 +147,7 @@ "az" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; - frequency = 1379; - id_tag = "solar_pump" + id_tag = null }, /obj/structure/cable/yellow{ d1 = 1; @@ -158,6 +157,7 @@ /obj/machinery/light/small{ dir = 4 }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "aB" = ( @@ -990,12 +990,11 @@ "dq" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "cargo_bay_door"; - locked = 1; + frequency = null; + id_tag = null; name = "Cargo Docking Hatch" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "dr" = ( @@ -1520,15 +1519,6 @@ d2 = 2; icon_state = "1-2" }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "solar_dock"; - name = "exterior access button"; - pixel_x = -26; - pixel_y = 26; - req_one_access = null - }, /obj/machinery/shield_diffuser, /turf/simulated/floor/airless, /area/space) @@ -2370,12 +2360,11 @@ id = "QMLoad2" }, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "cargo_bay_door"; - locked = 1; + frequency = null; + id_tag = null; name = "Cargo Docking Hatch" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "hh" = ( @@ -3737,16 +3726,15 @@ "ln" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "cargo_bay_door"; - locked = 1; + frequency = null; + id_tag = null; name = "Cargo Docking Hatch" }, /obj/machinery/conveyor{ dir = 4; id = "QMLoad" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "lo" = ( @@ -4339,14 +4327,6 @@ d2 = 8; icon_state = "2-8" }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "solar_dock"; - name = "interior access button"; - pixel_x = -28; - pixel_y = -24 - }, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "nc" = ( @@ -4429,10 +4409,8 @@ /area/maintenance/lower/bar) "nm" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "solar_outer"; - locked = 1; + frequency = null; + id_tag = null; name = "Solars" }, /obj/structure/cable/yellow{ @@ -4440,6 +4418,13 @@ d2 = 2; icon_state = "1-2" }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/access_button{ + master_tag = null; + pixel_x = -32; + pixel_y = -10 + }, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "nn" = ( @@ -6779,24 +6764,21 @@ icon_state = "1-2" }, /obj/machinery/embedded_controller/radio/airlock/docking_port{ - id_tag = "solar_dock"; - pixel_x = -24; - req_one_access = null; - tag_airpump = "solar_pump"; - tag_chamber_sensor = "solar_sensor"; - tag_exterior_door = "solar_outer"; - tag_interior_door = "solar_inner" + dir = 4; + id_tag = "solar_airlock"; + pixel_x = -25 }, /obj/machinery/airlock_sensor{ - id_tag = "solar_sensor"; - pixel_x = 28; - pixel_y = -1 + dir = 8; + id_tag = null; + pixel_x = 22 }, /obj/machinery/meter{ frequency = 1443; id = "dist_aux_meter"; name = "Distribution Loop" }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "uC" = ( @@ -10160,8 +10142,7 @@ "FK" = ( /obj/machinery/computer/roguezones, /obj/effect/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /turf/simulated/floor/tiled, /area/triumph/surfacebase/mining_main/refinery) @@ -10970,12 +10951,18 @@ icon_state = "1-2" }, /obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "solar_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Solars" }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + dir = 1; + master_tag = null; + pixel_x = -32; + pixel_y = 10 + }, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/dark, /area/maintenance/dormitory) "In" = ( @@ -13596,10 +13583,8 @@ "QZ" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "cargo_bay_door"; - locked = 1; + frequency = null; + id_tag = null; name = "Cargo Docking Hatch" }, /obj/machinery/conveyor{ @@ -13607,6 +13592,7 @@ id = "QMLoad" }, /obj/machinery/shield_diffuser, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "Ra" = ( @@ -14838,12 +14824,11 @@ }, /obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "cargo_bay_door"; - locked = 1; + frequency = null; + id_tag = null; name = "Cargo Docking Hatch" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/plating, /area/quartermaster/warehouse) "UH" = ( @@ -15944,13 +15929,15 @@ /area/triumph/surfacebase/mining_main/storage) "XI" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 8; frequency = 1380; id_tag = "supply_shuttle"; layer = 3.3; name = "cargo bay hatch controller"; - pixel_x = 30; + pixel_x = 25; + pixel_y = 1; req_one_access = list(13,31); - tag_door = "cargo_bay_door" + tag_door = null }, /obj/machinery/camera/network/cargo{ dir = 8 @@ -15960,13 +15947,12 @@ "XJ" = ( /obj/machinery/door/firedoor/border_only, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "cargo_bay_door"; - locked = 1; + frequency = null; + id_tag = null; name = "Cargo Docking Hatch" }, /obj/machinery/shield_diffuser, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/quartermaster/warehouse) "XK" = ( @@ -16515,8 +16501,7 @@ "ZF" = ( /obj/machinery/firealarm{ dir = 1; - pixel_x = -28; - pixel_y = 0 + pixel_x = -28 }, /turf/simulated/floor/tiled/freezer, /area/crew_quarters/freezer) diff --git a/_maps/map_files/triumph/triumph-03-deck3.dmm b/_maps/map_files/triumph/triumph-03-deck3.dmm index 3b12a366419..775df6f9bf7 100644 --- a/_maps/map_files/triumph/triumph-03-deck3.dmm +++ b/_maps/map_files/triumph/triumph-03-deck3.dmm @@ -152,13 +152,11 @@ /area/medical/virology) "ar" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "deck3_airlock_outer"; - locked = 1; - name = "Docking Port Airlock" + frequency = null; + name = "Public Airlock" }, /obj/machinery/shield_diffuser, +/obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -611,8 +609,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) @@ -980,14 +977,6 @@ /obj/effect/floor_decal/corner/paleblue/border, /obj/random/medical, /obj/item/hand_labeler, -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "large_escape_pod_1"; - pixel_x = 8; - pixel_y = -23; - req_one_access = list(5); - tag_door = "large_escape_pod_1_hatch" - }, /turf/simulated/floor/tiled/white, /area/hallway/secondary/escape/medical_escape_pod_hallway) "bZ" = ( @@ -1274,8 +1263,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -1606,8 +1594,7 @@ dir = 8 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/old_cargo/gray, /area/medical/surgery{ @@ -1827,8 +1814,7 @@ dir = 8 }, /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/machinery/ai_status_display{ pixel_y = -32 @@ -2053,8 +2039,7 @@ pixel_x = 25 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/medical/psych) @@ -2813,13 +2798,11 @@ /area/maintenance/research) "fK" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "deck3_airlock_inner"; - locked = 1; - name = "Docking Port Airlock" + frequency = null; + name = "Public Airlock" }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -3208,8 +3191,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -3381,12 +3363,12 @@ "gP" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1380; - id_tag = "deck3_airlock_pump" + id_tag = null }, /obj/machinery/camera/network/civilian{ dir = 4 }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -4735,8 +4717,7 @@ dir = 1 }, /obj/effect/floor_decal/industrial/warning/cee{ - dir = 1; - icon_state = "warningcee" + dir = 1 }, /obj/machinery/computer/general_air_control/large_tank_control{ input_tag = "atmos_out"; @@ -4758,8 +4739,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/plating, /area/maintenance/fore) @@ -5121,12 +5101,11 @@ "kp" = ( /obj/machinery/door/firedoor/glass, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "large_escape_pod_1_hatch"; - locked = 1; + frequency = null; + id_tag = null; name = "Emergency Airlock" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/floor/tiled, /area/hallway/secondary/escape/medical_escape_pod_hallway) "kq" = ( @@ -5719,15 +5698,22 @@ /turf/simulated/wall, /area/triumph/station/stairs_three) "lC" = ( -/obj/machinery/embedded_controller/radio/simple_docking_controller{ - frequency = 1380; - id_tag = "large_escape_pod_1"; - pixel_x = 25; - pixel_y = 26; - req_one_access = list(5) +/obj/machinery/door/airlock/glass_external{ + frequency = null; + name = "Public Airlock" }, -/turf/simulated/shuttle/floor, -/area/shuttle/large_escape_pod1) +/obj/machinery/shield_diffuser, +/obj/machinery/access_button{ + master_tag = null; + pixel_x = 23; + pixel_y = -10 + }, +/obj/effect/map_helper/airlock/button/ext_button, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/hallway/primary/starboard) "lD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -7273,8 +7259,7 @@ icon_state = "1-2" }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/techfloor, /area/medical/morgue) @@ -7651,8 +7636,7 @@ /area/medical/ward) "pr" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/light_switch{ pixel_x = 25 @@ -8070,13 +8054,10 @@ /area/medical/first_aid_station) "qd" = ( /obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "deck3_airlock"; - name = "interior access button"; - pixel_x = -11; - pixel_y = -24 + master_tag = null; + pixel_y = -22 }, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled, /area/hallway/primary/starboard) "qe" = ( @@ -8878,16 +8859,24 @@ name = "\improper Psych Room 2" }) "rQ" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "deck3_airlock"; - name = "exterior access button"; - pixel_x = 26; - pixel_y = 26 +/obj/machinery/door/firedoor/glass, +/obj/machinery/door/airlock/glass_external{ + frequency = null; + id_tag = null; + name = "Emergency Airlock" }, -/turf/space, -/area/space) +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 1; + frequency = 1380; + id_tag = "large_escape_pod_1"; + pixel_x = 32; + pixel_y = 7; + req_one_access = list(5); + tag_door = "large_escape_pod_1_hatch" + }, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/floor/tiled, +/area/hallway/secondary/escape/medical_escape_pod_hallway) "rR" = ( /obj/machinery/vending/coffee, /turf/simulated/floor/tiled, @@ -10540,8 +10529,7 @@ dir = 9 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/wood, /area/triumph/station/stairs_three) @@ -11508,8 +11496,7 @@ /area/medical/first_aid_station) "wS" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/wood, /area/medical/psych{ @@ -12428,16 +12415,15 @@ /area/medical/surgery_hallway) "yB" = ( /obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "deck3_airlock_sensor"; - pixel_x = -2; - pixel_y = -24 + id_tag = null; + pixel_y = -22 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1380; - id_tag = "deck3_airlock_pump" + id_tag = null }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -12541,7 +12527,6 @@ /obj/machinery/door/blast/regular{ dir = 8; id = "burn_chamber_v"; - layer = 2.7; name = "Burn Chamber Vent" }, /turf/simulated/floor/reinforced/airless, @@ -12674,8 +12659,7 @@ /area/triumph/station/stairs_three) "zc" = ( /obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4; - icon_state = "map" + dir = 4 }, /obj/machinery/meter, /turf/simulated/floor/tiled, @@ -12717,8 +12701,7 @@ /area/hallway/primary/aft) "zf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -13953,9 +13936,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, -/obj/structure/dispenser{ - phorontanks = 10 - }, +/obj/structure/dispenser, /turf/simulated/floor/tiled, /area/rnd/test_area) "Bu" = ( @@ -14735,8 +14716,7 @@ /area/triumph/station/stairs_three) "CO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -15166,12 +15146,10 @@ /area/rnd/reception_desk) "DD" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "deck3_airlock_inner"; - locked = 1; - name = "Docking Port Airlock" + frequency = null; + name = "Public Airlock" }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -15302,8 +15280,7 @@ dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/cable/green{ d1 = 1; @@ -15395,8 +15372,7 @@ /area/rnd/research_foyer_auxiliary) "Ed" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -16127,9 +16103,7 @@ /area/hallway/primary/starboard) "Fx" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/atmospherics/portables_connector, /turf/simulated/floor/tiled, @@ -16438,17 +16412,17 @@ /obj/machinery/embedded_controller/radio/airlock/docking_port{ frequency = 1380; id_tag = "deck3_airlock"; - pixel_y = 28; - tag_airpump = "deck3_airlock_pump"; - tag_chamber_sensor = "deck3_airlock_sensor"; - tag_exterior_door = "deck3_airlock_outer"; - tag_interior_door = "deck3_airlock_inner" + pixel_y = 25; + tag_airpump = null; + tag_chamber_sensor = null; + tag_exterior_door = null; + tag_interior_door = null }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1380; - id_tag = "deck3_airlock_pump" + id_tag = null }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled{ icon_state = "techmaint" }, @@ -16504,12 +16478,21 @@ /turf/simulated/floor/tiled, /area/rnd/hallway) "Gn" = ( -/obj/machinery/atmospherics/pipe/manifold/visible/red{ - dir = 4; - icon_state = "map" +/obj/machinery/door/airlock/glass_external{ + frequency = null; + id_tag = null; + name = "Emergency Airlock" }, -/turf/simulated/floor/tiled, -/area/rnd/test_area) +/obj/machinery/embedded_controller/radio/simple_docking_controller{ + frequency = 1380; + id_tag = "large_escape_pod_1"; + pixel_x = 32; + pixel_y = -8; + req_one_access = list(5) + }, +/obj/effect/map_helper/airlock/door/simple, +/turf/simulated/shuttle/floor, +/area/shuttle/large_escape_pod1) "Go" = ( /turf/simulated/wall, /area/rnd/workshop) @@ -16522,8 +16505,7 @@ /area/rnd/xenobiology) "Gq" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced{ dir = 4 @@ -16777,8 +16759,7 @@ "GQ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/structure/cable/green{ d1 = 1; @@ -16989,8 +16970,7 @@ /area/medical/medbay_emt_bay) "Hk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -17307,8 +17287,7 @@ "HO" = ( /obj/structure/grille, /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced{ dir = 4 @@ -20254,12 +20233,11 @@ /area/hallway/secondary/escape/medical_escape_pod_hallway) "NN" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "large_escape_pod_1_hatch"; - locked = 1; + frequency = null; + id_tag = null; name = "Emergency Airlock" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/shuttle/floor, /area/shuttle/large_escape_pod1) "NO" = ( @@ -21717,8 +21695,7 @@ /area/rnd/xenobiology) "QD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled, /area/rnd/test_area) @@ -23528,8 +23505,7 @@ dir = 8 }, /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced{ dir = 1 @@ -23598,8 +23574,7 @@ /obj/item/storage/fancy/vials, /obj/item/storage/fancy/vials, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled/white, /area/medical/chemistry) @@ -23642,8 +23617,7 @@ /area/medical/virology) "Uu" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced{ dir = 4 @@ -25056,8 +25030,7 @@ }) "Xm" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -25646,8 +25619,7 @@ /area/triumph/station/stairs_three) "Yu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -36296,7 +36268,7 @@ yD Ji WG Pb -Gn +MA zc to fy @@ -36759,9 +36731,9 @@ SI SI uG uj -kp -NN -lC +rQ +Gn +KA KA Gl Wp @@ -40719,8 +40691,8 @@ DD aH aH aH -ar -rQ +lC +gK ss gK gK diff --git a/_maps/map_files/triumph/triumph-04-deck4.dmm b/_maps/map_files/triumph/triumph-04-deck4.dmm index 3cbf55233f1..7889eef1c64 100644 --- a/_maps/map_files/triumph/triumph-04-deck4.dmm +++ b/_maps/map_files/triumph/triumph-04-deck4.dmm @@ -1127,14 +1127,6 @@ "aSO" = ( /turf/simulated/wall/r_wall, /area/maintenance/security_starboard) -"aST" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 8; - frequency = 1379; - id_tag = "sec_shuttle_pump" - }, -/turf/simulated/floor/plating, -/area/security/hanger) "aTx" = ( /obj/machinery/hologram/holopad, /obj/machinery/turretid/lethal{ @@ -1516,10 +1508,10 @@ "bhO" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1379; - id_tag = "sec_shuttle_pump" + id_tag = null }, /obj/machinery/camera/network/security, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/security/hanger) "bhV" = ( @@ -1798,17 +1790,15 @@ /turf/simulated/floor/tiled, /area/triumph/surfacebase/tram) "bqP" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "d1d_dock"; - name = "exterior access button"; - pixel_x = -26; - pixel_y = -24; - req_one_access = list(13) +/obj/machinery/shield_diffuser, +/obj/machinery/door/airlock/glass_external{ + frequency = null; + id_tag = null; + name = "Docking Port Airlock" }, -/turf/space, -/area/space) +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway) "bqS" = ( /obj/machinery/vending/coffee, /obj/effect/floor_decal/spline/plain, @@ -1866,7 +1856,6 @@ /obj/structure/table/reinforced, /obj/machinery/alarm/alarms_hidden{ dir = 8; - icon_state = "alarm0"; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -2262,15 +2251,20 @@ /area/hallway/secondary/civilian_hallway_mid) "bHp" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1b_dock_inner"; - locked = 1; - name = "Docking Port Airlock" + frequency = null; + name = "Public Airlock" }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + dir = 4; + master_tag = null; + pixel_x = 10; + pixel_y = 32 + }, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "bHx" = ( @@ -2621,14 +2615,14 @@ /area/security/tactical) "bVX" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "civvie_door_Ro" + frequency = null; + id_tag = null }, /obj/machinery/access_button{ command = "cycle_exterior"; frequency = 1380; master_tag = "civvie_docker"; - pixel_x = -12; + pixel_x = -10; pixel_y = -21 }, /obj/structure/cable/green{ @@ -2638,6 +2632,8 @@ }, /obj/machinery/shield_diffuser, /obj/structure/fans/tiny, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "bWu" = ( @@ -2922,12 +2918,19 @@ "cgx" = ( /obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1d_dock_outer"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, +/obj/machinery/access_button{ + dir = 1; + master_tag = null; + pixel_x = -23; + pixel_y = 10; + req_one_access = list(13) + }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "cgH" = ( @@ -3128,17 +3131,9 @@ /turf/simulated/floor/carpet/bcarpet, /area/hallway/secondary/civilian_hallway_mid) "cmP" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "d1b_dock"; - name = "exterior access button"; - pixel_x = 26; - pixel_y = 26; - req_one_access = null - }, -/turf/space, -/area/space) +/obj/effect/floor_decal/sign/dock/one, +/turf/simulated/wall/r_wall, +/area/hallway/secondary/docking_hallway) "cnz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -3279,14 +3274,20 @@ /turf/simulated/floor/tiled/dark, /area/hallway/secondary/civilian_hallway_mid) "crT" = ( +/obj/machinery/shield_diffuser, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1a_dock_outer"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, -/obj/machinery/shield_diffuser, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/button/ext_button, +/obj/machinery/access_button{ + master_tag = null; + pixel_x = -23; + pixel_y = -10; + req_one_access = list(13) + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "ctb" = ( @@ -3393,8 +3394,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/door/window/brigdoor/westright{ dir = 4; - name = "Firing Range Door"; - req_access = list(1) + name = "Firing Range Door" }, /turf/simulated/floor/tiled/dark, /area/security/range) @@ -3615,8 +3615,8 @@ /area/chapel/main) "cCQ" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "civvie_door_Ri" + frequency = null; + id_tag = null }, /obj/structure/cable/green{ d1 = 4; @@ -3624,6 +3624,7 @@ icon_state = "4-8" }, /obj/machinery/door/firedoor, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "cCY" = ( @@ -4418,12 +4419,16 @@ /area/security/training) "dnp" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "sec_shuttle_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Shuttle Internal Access" }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + pixel_y = 22; + req_one_access = list(1,2) + }, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "dnw" = ( @@ -4610,19 +4615,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/civilian_hallway_mid) "duk" = ( -/obj/machinery/embedded_controller/radio/airlock/docking_port{ - frequency = 1380; - id_tag = "d1b_dock"; - pixel_y = 28; - req_one_access = null; - tag_airpump = "d1b_dock_pump"; - tag_chamber_sensor = "d1b_dock_sensor"; - tag_exterior_door = "d1b_dock_outer"; - tag_interior_door = "d1b_dock_inner" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/machinery/embedded_controller/radio/airlock/airlock_controller{ + frequency = 1380; + id_tag = "d1b_airlock"; + pixel_y = 25 + }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "duy" = ( @@ -4688,10 +4688,10 @@ }, /obj/machinery/button/remote/airlock{ desiredstate = 1; - dir = 1; + dir = 4; id = "expshuttle_door_L"; name = "hatch bolt control"; - pixel_y = -28; + pixel_y = -22; req_one_access = list(19,43,67); specialfunctions = 4 }, @@ -5165,12 +5165,11 @@ dir = 4 }, /obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "sec_shuttle_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Shuttle Internal Access" }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "dNT" = ( @@ -5324,6 +5323,10 @@ /obj/machinery/door/firedoor/glass/hidden/steel{ dir = 8 }, +/obj/machinery/shuttle_sensor{ + id_tag = null; + pixel_y = 21 + }, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "dTy" = ( @@ -5747,16 +5750,15 @@ /turf/simulated/floor/wood, /area/library) "ehK" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "civvie_dock_inner"; - locked = 1; - name = "Docking Port Airlock" - }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 }, +/obj/machinery/door/airlock/glass_external{ + frequency = null; + id_tag = null; + name = "Docking Port Airlock" + }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "eix" = ( @@ -5892,12 +5894,6 @@ /area/security/security_equiptment_storage) "epv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "civvie_docker"; - pixel_x = -27 - }, /obj/machinery/door/airlock/voidcraft, /obj/machinery/meter, /obj/machinery/door/firedoor, @@ -5987,9 +5983,7 @@ /area/crew_quarters/sleep/RD_quarters) "esl" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/effect/floor_decal/borderfloor{ dir = 8 @@ -6271,22 +6265,21 @@ frequency = 1380; id_tag = "civvie_docker"; pixel_y = 30; - tag_airpump = "civvie_dock_pump"; - tag_chamber_sensor = "civvie_dock_sensor"; - tag_exterior_door = "civvie_dock_outer"; - tag_interior_door = "civvie_dock_inner" + tag_airpump = null; + tag_chamber_sensor = null; + tag_exterior_door = null; + tag_interior_door = null }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "civvie_dock_pump" + id_tag = null }, /obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "civvie_dock_sensor"; - pixel_x = 1; - pixel_y = 20 + id_tag = null; + pixel_y = 21 }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "eCV" = ( @@ -6595,18 +6588,9 @@ "eLn" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1379; - id_tag = "sec_shuttle_pump" - }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sec_shuttle_airlock"; - name = "exterior access button"; - pixel_x = 25; - pixel_y = -23; - req_one_access = list(1,2) + id_tag = null }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/security/hanger) "eLD" = ( @@ -6624,10 +6608,10 @@ /area/security/security_bathroom) "eLS" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_external"; + id_tag = null; power_rating = 20000 }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/excursion/general) "eMf" = ( @@ -6649,8 +6633,7 @@ /area/hydroponics/garden) "eMH" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/carpet/tealcarpet, /area/crew_quarters/sleep/CMO_quarters) @@ -7923,8 +7906,9 @@ /area/hydroponics/garden) "fJc" = ( /obj/machinery/shuttle_sensor{ - dir = 6; - id_tag = "shuttlesens_exp_int" + dir = 4; + id_tag = null; + pixel_x = 12 }, /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/excursion/general) @@ -8202,19 +8186,20 @@ /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/captain) "fUd" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ro" - }, -/obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "expshuttle_exterior_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = -23; - pixel_y = 3 - }, /obj/structure/fans/tiny, +/obj/machinery/door/airlock/voidcraft/vertical{ + frequency = null; + id_tag = null + }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/access_button{ + command = "cycle_interior"; + dir = 4; + frequency = 1380; + master_tag = "expshuttle_docker"; + pixel_x = 20 + }, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/shuttle/plating, /area/shuttle/excursion/general) "fVj" = ( @@ -8379,6 +8364,18 @@ }, /turf/simulated/floor/tiled, /area/triumph/station/excursion_dock) +"gaX" = ( +/obj/effect/overmap/visitable/ship/landable/excursion, +/obj/machinery/airlock_sensor{ + dir = 8; + frequency = 1380; + id_tag = "expshuttle_sensor"; + master_tag = "expshuttle_docker"; + pixel_x = 20 + }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/turf/simulated/floor/tiled, +/area/shuttle/excursion/general) "gcJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -10418,12 +10415,10 @@ /area/chapel/main) "hDG" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1b_dock_inner"; - locked = 1; - name = "Docking Port Airlock" + frequency = null; + name = "Public Airlock" }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "hDH" = ( @@ -11175,8 +11170,7 @@ /area/crew_quarters/captain) "ibO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -11345,8 +11339,7 @@ /area/triumph/station/explorer_entry) "ijD" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced/full, /obj/structure/grille, @@ -12722,12 +12715,11 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "civvie_dock_outer"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, +/obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "jjh" = ( @@ -12752,6 +12744,7 @@ "jjv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/map_helper/airlock/sensor/int_sensor, /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) "jjE" = ( @@ -13147,8 +13140,7 @@ /area/crew_quarters/sleep/HOP_quarters) "jzd" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /turf/simulated/floor/tiled/dark, /area/gateway) @@ -13184,8 +13176,7 @@ /area/security/hanger) "jAx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -13878,21 +13869,22 @@ "kdF" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ cycle_to_external_air = 1; + dir = 4; frequency = 1380; id_tag = "expshuttle_docker"; - pixel_x = -22; + pixel_x = -24; req_one_access = list(19,43,67); - tag_airpump = "expshuttle_vent"; - tag_chamber_sensor = "expshuttle_sensor"; - tag_exterior_door = "expshuttle_door_Ro"; - tag_exterior_sensor = "expshuttle_exterior_sensor"; - tag_interior_door = "expshuttle_door_Ri" + tag_airpump = null; + tag_chamber_sensor = null; + tag_exterior_door = null; + tag_exterior_sensor = null; + tag_interior_door = null }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = null }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "kdI" = ( @@ -14012,14 +14004,6 @@ /obj/machinery/status_display, /turf/simulated/wall/r_wall, /area/crew_quarters/captain) -"kln" = ( -/obj/machinery/atmospherics/unary/vent_pump/high_volume{ - dir = 4; - frequency = 1380; - id_tag = "expshuttle_vent" - }, -/turf/simulated/floor/tiled, -/area/shuttle/excursion/general) "klp" = ( /obj/structure/cable/green{ d1 = 1; @@ -14251,12 +14235,9 @@ /turf/simulated/floor/tiled, /area/security/hallway) "kvi" = ( -/obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "civvie_exp" - }, -/turf/simulated/shuttle/wall/voidcraft/hard_corner, -/area/shuttle/civvie/general) +/obj/effect/floor_decal/sign/a, +/turf/simulated/wall/r_wall, +/area/hallway/secondary/docking_hallway) "kvk" = ( /obj/effect/shuttle_landmark/triumph/deck4/civvie, /obj/effect/overmap/visitable/ship/landable/civvie, @@ -14264,7 +14245,7 @@ cycle_to_external_air = 1; frequency = 1380; id_tag = "civvie_docker"; - pixel_y = 27; + pixel_y = 25; tag_airpump = "civvie_vent"; tag_chamber_sensor = "civvie_sensor"; tag_exterior_door = "civvie_door_Ro"; @@ -14277,6 +14258,7 @@ frequency = 1380; id_tag = "civvie_vent" }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "kvw" = ( @@ -14750,18 +14732,14 @@ /turf/simulated/floor/tiled/techfloor/grid, /area/hallway/secondary/civilian_hallway_mid) "kPj" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1379; - master_tag = "sec_shuttle_airlock"; - name = "exterior access button"; - pixel_x = 25; - pixel_y = 23; - req_one_access = list(1,2) - }, /obj/machinery/shield_diffuser, -/turf/simulated/floor/airless/ceiling, -/area/security/hanger) +/obj/machinery/door/airlock/glass_external{ + frequency = null; + name = "Public Airlock" + }, +/obj/effect/map_helper/airlock/door/ext_door, +/turf/simulated/floor/tiled/dark, +/area/hallway/secondary/docking_hallway) "kPI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -14784,6 +14762,15 @@ dir = 1 }, /area/triumph/station/explorer_entry) +"kQR" = ( +/obj/machinery/shuttle_sensor{ + dir = 1; + id_tag = "shuttlesens_exp"; + pixel_y = -12 + }, +/obj/effect/map_helper/airlock/sensor/int_sensor, +/turf/simulated/shuttle/wall/voidcraft/blue, +/area/shuttle/excursion/general) "kRc" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plating, @@ -15041,13 +15028,12 @@ /area/security/security_processing) "kZq" = ( /obj/machinery/airlock_sensor/airlock_exterior/shuttle{ - dir = 6; - frequency = 1380; - id_tag = "civvie_exterior_sensor"; - master_tag = "civvie_docker"; - pixel_x = -8; - pixel_y = 3 + dir = 8; + id_tag = null; + master_tag = null; + pixel_x = -11 }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, /turf/simulated/shuttle/wall/voidcraft/green, /area/shuttle/civvie/general) "kZr" = ( @@ -15631,14 +15617,21 @@ /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "luR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1a_dock_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, -/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + dir = 1; + master_tag = null; + pixel_x = -32; + pixel_y = 10; + req_one_access = list(13) + }, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "lvd" = ( @@ -15735,7 +15728,6 @@ "lyv" = ( /obj/machinery/atmospherics/unary/outlet_injector{ dir = 1; - icon_state = "map_injector"; use_power = 1 }, /turf/simulated/floor/airless, @@ -15804,14 +15796,15 @@ /area/security/hallwayaux) "lAR" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 4; frequency = 1380; id_tag = "d1a_dock"; - pixel_x = -24; + pixel_x = -25; req_one_access = list(13); - tag_airpump = "d1a_dock_pump"; - tag_chamber_sensor = "d1a_dock_sensor"; - tag_exterior_door = "d1a_dock_outer"; - tag_interior_door = "d1a_dock_inner" + tag_airpump = null; + tag_chamber_sensor = null; + tag_exterior_door = null; + tag_interior_door = null }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 5 @@ -16532,16 +16525,13 @@ pixel_x = -22 }, /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/RD_quarters) "lXQ" = ( /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/structure/bed/chair/comfy/black{ dir = 1 @@ -17352,8 +17342,7 @@ /area/triumph/surfacebase/tram) "mFh" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced/full, /obj/structure/grille, @@ -18112,21 +18101,18 @@ /turf/simulated/floor/plating, /area/maintenance/security_starboard) "nfc" = ( +/obj/machinery/access_button{ + master_tag = null; + pixel_x = 9; + pixel_y = 22 + }, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "civvie_dock_outer"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "civvie_dock"; - name = "exterior access button"; - pixel_x = -1; - pixel_y = 29 - }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "nfn" = ( @@ -18275,8 +18261,7 @@ dir = 4 }, /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/structure/table/woodentable, /obj/item/towel/random, @@ -18330,9 +18315,9 @@ "nnI" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = null }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "nnL" = ( @@ -18546,14 +18531,19 @@ /turf/simulated/floor/tiled, /area/security/brig) "nuT" = ( -/obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1b_dock_outer"; - locked = 1; - name = "Docking Port Airlock" - }, /obj/machinery/shield_diffuser, +/obj/machinery/door/airlock/glass_external{ + frequency = null; + name = "Public Airlock" + }, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/access_button{ + dir = 8; + master_tag = null; + pixel_x = -10; + pixel_y = 23 + }, +/obj/effect/map_helper/airlock/button/ext_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "nvw" = ( @@ -18711,7 +18701,6 @@ /area/crew_quarters/heads/hos) "nzz" = ( /obj/machinery/door/window{ - dir = 4; name = "Mass Driver"; req_access = list(22) }, @@ -18723,8 +18712,7 @@ pixel_y = 25 }, /obj/effect/floor_decal/industrial/warning{ - dir = 4; - icon_state = "warning" + dir = 4 }, /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -18734,14 +18722,12 @@ "nzO" = ( /obj/structure/table/steel, /obj/machinery/embedded_controller/radio/airlock/airlock_controller{ - id_tag = "sec_shuttle_airlock"; - pixel_y = 3; + dir = 4; + frequency = 1380; + id_tag = "sec_shuttlebay"; + pixel_y = 2; req_access = newlist(); - req_one_access = list(1,2); - tag_airpump = "sec_shuttle_pump"; - tag_chamber_sensor = "sec_shuttle_sensor"; - tag_exterior_door = "sec_shuttle_outer"; - tag_interior_door = "sec_shuttle_inner" + req_one_access = list(1,2) }, /turf/simulated/floor/tiled, /area/security/hanger) @@ -18893,21 +18879,23 @@ }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "civvie_dock_pump" + id_tag = null }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "nHU" = ( /obj/machinery/embedded_controller/radio/airlock/docking_port{ + dir = 4; frequency = 1380; id_tag = "d1d_dock"; - pixel_x = -24; + pixel_x = -25; + pixel_y = 1; req_one_access = list(13); - tag_airpump = "d1d_dock_pump"; - tag_chamber_sensor = "d1d_dock_sensor"; - tag_exterior_door = "d1d_dock_outer"; - tag_interior_door = "d1d_dock_inner" + tag_airpump = null; + tag_chamber_sensor = null; + tag_exterior_door = null; + tag_interior_door = null }, /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 6 @@ -18988,9 +18976,7 @@ "nLY" = ( /obj/structure/table/reinforced, /obj/machinery/light{ - dir = 8; - icon_state = "tube1"; - pixel_y = 0 + dir = 8 }, /obj/machinery/recharger, /obj/random/tech_supply, @@ -19620,8 +19606,7 @@ /area/triumph/station/stairs_one) "okL" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced/full, /obj/structure/grille, @@ -20132,10 +20117,8 @@ /area/lawoffice) "oGO" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1379; - icon_state = "door_locked"; - id_tag = "sec_shuttle_outer"; - locked = 1; + frequency = null; + id_tag = null; name = "Shuttle Exterior Access" }, /obj/machinery/door/blast/regular{ @@ -20146,6 +20129,7 @@ opacity = 0 }, /obj/machinery/shield_diffuser, +/obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/plating, /area/security/hanger) "oHp" = ( @@ -20608,9 +20592,7 @@ /turf/simulated/floor/tiled/dark, /area/chapel/main) "oVF" = ( -/obj/effect/landmark/map_data/triumph{ - height = 4 - }, +/obj/effect/landmark/map_data/triumph, /turf/space, /area/space) "oVI" = ( @@ -20763,8 +20745,7 @@ opacity = 0 }, /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /turf/simulated/shuttle/floor/voidcraft, /area/bridge) @@ -21553,11 +21534,12 @@ /area/hallway/primary/aft) "pFz" = ( /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "civvie_door_Ro" + frequency = null; + id_tag = null }, /obj/machinery/shield_diffuser, /obj/structure/fans/tiny, +/obj/effect/map_helper/airlock/door/ext_door, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "pFE" = ( @@ -21970,28 +21952,29 @@ /turf/simulated/floor/grass, /area/hydroponics/garden) "pSB" = ( -/obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "expshuttle_door_Ri" - }, /obj/machinery/access_button{ command = "cycle_interior"; + dir = 4; frequency = 1380; master_tag = "expshuttle_docker"; - pixel_x = -27 + pixel_x = -20 }, +/obj/machinery/door/airlock/voidcraft/vertical{ + frequency = null; + id_tag = null + }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "pTM" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "expshuttle_docker_pump_out_internal" + id_tag = null }, /obj/machinery/light{ dir = 8 }, -/obj/effect/overmap/visitable/ship/landable/excursion, /obj/effect/shuttle_landmark/triumph/deck4/excursion, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) @@ -22045,8 +22028,7 @@ /area/triumph/surfacebase/sauna) "pVB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -22252,8 +22234,7 @@ /area/security/training) "pZU" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced/full, /obj/structure/grille, @@ -24665,8 +24646,7 @@ /area/triumph/surfacebase/sauna) "rzp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -24749,16 +24729,17 @@ /area/security/warden) "rBC" = ( /obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "d1d_dock_sensor"; - pixel_x = 28; + dir = 8; + id_tag = null; + pixel_x = 22; pixel_y = -1 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "d1d_dock_pump" + id_tag = null }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "rBF" = ( @@ -25403,8 +25384,7 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5; - icon_state = "intact-scrubbers" + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -25508,8 +25488,7 @@ dir = 1 }, /obj/machinery/atmospherics/portables_connector{ - dir = 4; - icon_state = "map_connector" + dir = 4 }, /obj/machinery/portable_atmospherics/canister/air/airlock{ start_pressure = 9119.25 @@ -25616,15 +25595,15 @@ "slh" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1380; - id_tag = "d1a_dock_pump" + id_tag = null }, /obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "d1a_dock_sensor"; - pixel_x = 28; - pixel_y = -1 + dir = 8; + id_tag = null; + pixel_x = 22 }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "slq" = ( @@ -25983,20 +25962,20 @@ /area/triumph/station/stairs_one) "szd" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ - frequency = 1380; - id_tag = "civvie_docker_pump_out_internal" + id_tag = null }, /obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "civvie_sensor"; - master_tag = "civvie_docker"; - pixel_y = -28 + id_tag = null; + master_tag = null; + pixel_y = -21 }, /obj/structure/cable/green{ d1 = 4; d2 = 8; icon_state = "4-8" }, +/obj/effect/map_helper/airlock/atmos/pump_out_internal, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "szT" = ( @@ -26022,8 +26001,7 @@ /area/security/forensics) "sAi" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/carpet/bcarpet, /area/crew_quarters/sleep/HOP_quarters) @@ -26539,13 +26517,12 @@ /area/security/hanger) "sPW" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1d_dock_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, /obj/machinery/atmospherics/pipe/simple/hidden, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "sQg" = ( @@ -26680,12 +26657,10 @@ /area/crew_quarters/heads/hos) "sVo" = ( /obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "civvie_dock"; - name = "interior access button"; - pixel_x = 2; - pixel_y = -23 + dir = 8; + master_tag = null; + pixel_x = -10; + pixel_y = -32 }, /obj/machinery/atmospherics/pipe/manifold/hidden, /obj/structure/cable/green{ @@ -26694,12 +26669,12 @@ icon_state = "4-8" }, /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "civvie_dock_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "sVx" = ( @@ -26981,16 +26956,9 @@ "tii" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 4; - frequency = 1380; - id_tag = "expshuttle_vent" - }, -/obj/machinery/airlock_sensor{ - frequency = 1380; - id_tag = "expshuttle_sensor"; - master_tag = "expshuttle_docker"; - pixel_x = 25; - pixel_y = 28 + id_tag = null }, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled, /area/shuttle/excursion/general) "tiI" = ( @@ -27014,17 +26982,28 @@ /turf/simulated/floor/tiled, /area/teleporter) "tkT" = ( -/obj/machinery/access_button{ - command = "cycle_exterior"; - frequency = 1380; - master_tag = "d1a_dock"; - name = "exterior access button"; - pixel_x = -26; - pixel_y = 29; - req_one_access = list(13) +/obj/machinery/door/airlock/glass_external{ + frequency = null; + id_tag = null; + name = "Shuttle Exterior Access" }, -/turf/space, -/area/space) +/obj/machinery/door/blast/regular{ + density = 0; + icon_state = "pdoor0"; + id = "security_lockdown"; + name = "Security Blast Doors"; + opacity = 0 + }, +/obj/machinery/shield_diffuser, +/obj/effect/map_helper/airlock/door/ext_door, +/obj/machinery/access_button{ + dir = 8; + pixel_x = 22; + req_one_access = list(1,2) + }, +/obj/effect/map_helper/airlock/button/ext_button, +/turf/simulated/floor/plating, +/area/security/hanger) "tlE" = ( /obj/machinery/fitness/punching_bag/clown, /turf/simulated/floor/tiled, @@ -27060,21 +27039,6 @@ }, /turf/simulated/floor/plating, /area/crew_quarters/heads/hop) -"tmH" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 1 - }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "d1d_dock"; - name = "interior access button"; - pixel_x = 22; - pixel_y = 22; - req_one_access = list(13) - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) "tnk" = ( /obj/structure/cable/green{ d1 = 4; @@ -27103,7 +27067,6 @@ /obj/structure/table/reinforced, /obj/machinery/alarm/alarms_hidden{ dir = 8; - icon_state = "alarm0"; pixel_x = 27 }, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -27229,15 +27192,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sec_shuttle_airlock"; - name = "interior access button"; - pixel_x = 23; - pixel_y = 24; - req_one_access = list(1,2) - }, /turf/simulated/floor/tiled/old_cargo/gray, /area/security/hanger) "trR" = ( @@ -27317,16 +27271,22 @@ dir = 4 }, /obj/machinery/door/airlock/voidcraft/vertical{ - frequency = 1380; - id_tag = "civvie_door_Ri" + frequency = null; + id_tag = null }, /obj/machinery/door/firedoor, +/obj/effect/map_helper/airlock/door/int_door, +/obj/machinery/access_button{ + master_tag = null; + pixel_x = 9; + pixel_y = 21 + }, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/old_tile/green, /area/shuttle/civvie/general) "tuM" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/old_tile/green, @@ -27491,15 +27451,16 @@ /area/crew_quarters/heads/hop) "tDn" = ( /obj/machinery/airlock_sensor{ - id_tag = "sec_shuttle_sensor"; - pixel_x = 24; - pixel_y = 10 + dir = 8; + id_tag = null; + pixel_x = 22 }, /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 8; - frequency = 1379; - id_tag = "sec_shuttle_pump" + id_tag = null }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/plating, /area/security/hanger) "tDq" = ( @@ -27727,9 +27688,11 @@ /area/triumph/station/explorer_prep) "tNz" = ( /obj/machinery/shuttle_sensor{ - dir = 5; - id_tag = "shuttlesens_exp" + dir = 1; + id_tag = "shuttlesens_exp"; + pixel_y = 12 }, +/obj/effect/map_helper/airlock/sensor/ext_sensor, /turf/simulated/shuttle/wall/voidcraft/blue, /area/shuttle/excursion/general) "tOa" = ( @@ -27753,12 +27716,18 @@ /area/security/brig) "tPH" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1d_dock_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, +/obj/machinery/access_button{ + master_tag = null; + pixel_x = 32; + pixel_y = -10; + req_one_access = list(13) + }, +/obj/effect/map_helper/airlock/door/int_door, +/obj/effect/map_helper/airlock/button/int_button, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "tQm" = ( @@ -28280,8 +28249,7 @@ /area/hallway/secondary/civilian_hallway_mid) "ujc" = ( /obj/machinery/light/small{ - dir = 8; - pixel_x = 0 + dir = 8 }, /turf/simulated/floor/carpet/oracarpet, /area/crew_quarters/sleep/CE_quarters) @@ -28714,25 +28682,15 @@ /area/triumph/station/explorer_entry) "uxk" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "d1a_dock_inner"; - locked = 1; + frequency = null; + id_tag = null; name = "Docking Port Airlock" }, +/obj/effect/map_helper/airlock/door/int_door, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "uxr" = ( /obj/effect/floor_decal/techfloor/orange, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "d1a_dock"; - name = "interior access button"; - pixel_x = -28; - pixel_y = -23; - req_one_access = list(13) - }, /obj/machinery/atmospherics/pipe/manifold/hidden{ dir = 1 }, @@ -29353,8 +29311,7 @@ /obj/machinery/button/remote/driver{ id = "chapelgun"; name = "Chapel Mass Driver"; - pixel_x = -25; - pixel_y = 0 + pixel_x = -25 }, /turf/simulated/floor/wood, /area/hallway/secondary/docking_hallway) @@ -29633,8 +29590,7 @@ /area/security/prison) "vde" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced/full, /obj/structure/grille, @@ -30041,15 +29997,6 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1379; - master_tag = "sec_shuttle_airlock"; - name = "interior access button"; - pixel_x = -26; - pixel_y = 24; - req_one_access = list(1,2) - }, /turf/simulated/floor/plating, /area/security/hanger) "vtg" = ( @@ -30875,8 +30822,7 @@ /area/crew_quarters/sleep/CMO_quarters) "vUs" = ( /obj/machinery/light{ - dir = 4; - icon_state = "tube1" + dir = 4 }, /turf/simulated/floor/tiled, /area/triumph/station/excursion_dock) @@ -31066,15 +31012,16 @@ "wbn" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume{ dir = 1; - frequency = 1380; - id_tag = "d1b_dock_pump" + id_tag = null }, /obj/machinery/airlock_sensor{ + dir = 1; frequency = 1380; id_tag = "d1b_dock_sensor"; - pixel_x = -2; - pixel_y = -24 + pixel_y = -22 }, +/obj/effect/map_helper/airlock/sensor/chamber_sensor, +/obj/effect/map_helper/airlock/atmos/chamber_pump, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "wbv" = ( @@ -31084,15 +31031,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 }, -/obj/machinery/access_button{ - command = "cycle_interior"; - frequency = 1380; - master_tag = "d1b_dock"; - name = "interior access button"; - pixel_x = -26; - pixel_y = 26; - req_one_access = null - }, /turf/simulated/floor/tiled/dark, /area/hallway/secondary/docking_hallway) "wbx" = ( @@ -31235,8 +31173,7 @@ /area/hydroponics/garden) "wfj" = ( /obj/structure/window/phoronreinforced{ - dir = 8; - icon_state = "phoronrwindow" + dir = 8 }, /obj/structure/window/phoronreinforced/full, /obj/structure/grille, @@ -31754,8 +31691,7 @@ /obj/machinery/door/firedoor/glass/hidden/steel, /obj/machinery/door/window/brigdoor/westright{ dir = 4; - name = "Firing Range Door"; - req_access = list(1) + name = "Firing Range Door" }, /turf/simulated/floor/tiled/dark, /area/security/range) @@ -32224,10 +32160,10 @@ "wUi" = ( /obj/machinery/atmospherics/unary/vent_pump/high_volume/wall_mounted{ dir = 4; - frequency = 1380; - id_tag = "civvie_docker_pump_out_external"; + id_tag = null; power_rating = 20000 }, +/obj/effect/map_helper/airlock/atmos/pump_out_external, /turf/simulated/shuttle/wall/voidcraft/hard_corner, /area/shuttle/civvie/general) "wUm" = ( @@ -32917,15 +32853,6 @@ "xsI" = ( /turf/simulated/floor/tiled/techfloor/grid, /area/triumph/station/excursion_dock) -"xsS" = ( -/obj/effect/floor_decal/techfloor/orange{ - dir = 1 - }, -/obj/effect/floor_decal/sign/dock{ - pixel_y = 32 - }, -/turf/simulated/floor/tiled/dark, -/area/hallway/secondary/docking_hallway) "xts" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37702,10 +37629,10 @@ eEl skC xsI hYe -ieD +gaX tii -kln -hYe +tii +kQR ieD jxu eau @@ -42146,10 +42073,10 @@ edy jAq bhO tDn -aST eLn -oGO -kPj +eLn +tkT +sCp nIK nIK nIK @@ -44910,7 +44837,7 @@ nIK nIK nIK nIK -cmP +nIK nIK nIK nIK @@ -45053,7 +44980,7 @@ nIK nIK nPD nuT -nuT +kPj nPD nIK nIK @@ -45335,7 +45262,7 @@ nPD nPD nPD nPD -nPD +kvi bHp hDG nPD @@ -45895,7 +45822,7 @@ nIK nIK nIK aFu -bqP +nIK cgx nHU sPW @@ -46038,10 +45965,10 @@ nIK nIK nIK nIK -cgx +bqP rBC tPH -tmH +fMX lba hSs nPD @@ -46182,8 +46109,8 @@ nIK nIK nPD nPD -nPD -xsS +cmP +fMX lba ctC nPD @@ -48035,7 +47962,7 @@ uxr luR lAR crT -tkT +nIK owu nIK nIK @@ -48176,7 +48103,7 @@ lGo bIw uxk slh -crT +bqP nIK nIK nIK @@ -48738,7 +48665,7 @@ nIK qzN aFX nIK -kvi +puZ pFz bVX wUi diff --git a/_maps/map_files/triumph/triumph-05-flagship.dmm b/_maps/map_files/triumph/triumph-05-flagship.dmm index 74718afc257..6c48a8983dc 100644 --- a/_maps/map_files/triumph/triumph-05-flagship.dmm +++ b/_maps/map_files/triumph/triumph-05-flagship.dmm @@ -311,11 +311,12 @@ /area/shuttle/specialops) "aD" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 1; frequency = 1380; id_tag = "specops_shuttle_fore"; name = "forward docking hatch controller"; - pixel_y = -25; - tag_door = "specops_shuttle_fore_hatch" + pixel_y = -23; + tag_door = null }, /turf/simulated/shuttle/floor{ icon_state = "floor_red" @@ -323,12 +324,11 @@ /area/shuttle/specialops) "aE" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "specops_shuttle_fore_hatch"; - locked = 1; + frequency = null; + id_tag = null; name = "Forward Docking Hatch" }, +/obj/effect/map_helper/airlock/door/simple, /turf/simulated/shuttle/plating, /area/shuttle/specialops) "aF" = ( @@ -503,10 +503,11 @@ /area/shuttle/specialops) "aS" = ( /obj/machinery/embedded_controller/radio/simple_docking_controller{ + dir = 1; frequency = 1380; id_tag = "specops_shuttle_port"; name = "port docking hatch controller"; - pixel_y = -25; + pixel_y = -23; tag_door = "specops_shuttle_port_hatch" }, /turf/simulated/shuttle/floor{ @@ -712,12 +713,11 @@ /area/shuttle/specialops) "bi" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "specops_shuttle_port_hatch"; - locked = 1; + frequency = null; + id_tag = null; name = "Port Docking Hatch" }, +/obj/effect/map_helper/airlock/door/simple, /turf/unsimulated/floor{ icon_state = "dark" }, @@ -994,11 +994,10 @@ /area/centcom/specops) "by" = ( /obj/machinery/door/airlock/glass_external{ - frequency = 1380; - icon_state = "door_locked"; - id_tag = "specops_centcom_dock_door"; - locked = 1 + frequency = null; + id_tag = null }, +/obj/effect/map_helper/airlock/door/simple, /turf/unsimulated/floor{ icon_state = "dark" }, diff --git a/code/modules/mapping/mapping_helpers/_mapping_helpers.dm b/code/modules/mapping/map_helpers/_map_helpers.dm similarity index 75% rename from code/modules/mapping/mapping_helpers/_mapping_helpers.dm rename to code/modules/mapping/map_helpers/_map_helpers.dm index 08c53e51e0f..31df78ee7e4 100644 --- a/code/modules/mapping/mapping_helpers/_mapping_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/mapping_helpers +/obj/effect/map_helper icon = 'icons/map/mapping_helpers.dmi' icon_state = "" var/late = FALSE -/obj/effect/mapping_helpers/Initialize() +/obj/effect/map_helper/Initialize() ..() return late ? INITIALIZE_HINT_LATELOAD : INITIALIZE_HINT_QDEL /* //airlock helpers -/obj/effect/mapping_helpers/airlock +/obj/effect/map_helper/airlock layer = DOOR_HELPER_LAYER -/obj/effect/mapping_helpers/airlock/cyclelink_helper +/obj/effect/map_helper/airlock/cyclelink_helper name = "airlock cyclelink helper" icon_state = "airlock_cyclelink_helper" -/obj/effect/mapping_helpers/airlock/cyclelink_helper/Initialize(mapload) +/obj/effect/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/mapping_helpers/airlock/locked +/obj/effect/map_helper/airlock/locked name = "airlock lock helper" icon_state = "airlock_locked_helper" -/obj/effect/mapping_helpers/airlock/locked/Initialize(mapload) +/obj/effect/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/mapping_helpers/airlock/unres +/obj/effect/map_helper/airlock/unres name = "airlock unresctricted side helper" icon_state = "airlock_unres_helper" -/obj/effect/mapping_helpers/airlock/unres/Initialize(mapload) +/obj/effect/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/mapping_helpers/no_lava) +INITIALIZE_IMMEDIATE(/obj/effect/map_helper/no_lava) -/obj/effect/mapping_helpers/no_lava +/obj/effect/map_helper/no_lava icon_state = "no_lava" -/obj/effect/mapping_helpers/no_lava/Initialize() +/obj/effect/map_helper/no_lava/Initialize() . = ..() var/turf/T = get_turf(src) T.flags_1 |= NO_LAVA_GEN_1 */ //This helper applies components to things on the map directly. -/obj/effect/mapping_helpers/component_injector +/obj/effect/map_helper/component_injector name = "Component Injector" late = TRUE var/target_type @@ -88,7 +88,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/mapping_helpers/no_lava) var/component_type //Late init so everything is likely ready and loaded (no warranty) -/obj/effect/mapping_helpers/component_injector/LateInitialize() +/obj/effect/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/mapping_helpers/no_lava) qdel(src) return -/obj/effect/mapping_helpers/component_injector/proc/build_args() +/obj/effect/map_helper/component_injector/proc/build_args() return list(component_type) /* -/obj/effect/mapping_helpers/component_injector/infective +/obj/effect/map_helper/component_injector/infective name = "Infective Injector" icon_state = "component_infective" component_type = /datum/component/infective var/disease_type -/obj/effect/mapping_helpers/component_injector/infective/build_args() +/obj/effect/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/mapping_helpers/airlock.dm b/code/modules/mapping/map_helpers/airlock.dm similarity index 55% rename from code/modules/mapping/mapping_helpers/airlock.dm rename to code/modules/mapping/map_helpers/airlock.dm index 0cbd8d7775a..f8b58114d16 100644 --- a/code/modules/mapping/mapping_helpers/airlock.dm +++ b/code/modules/mapping/map_helpers/airlock.dm @@ -4,24 +4,23 @@ You still need to set the controller's "id_tag" to something unique. Any frequency works, it's self-setting, but it seems like people have decided 1380 for airlocks so maybe set that on the controller too. */ -/obj/effect/mapping_helpers/airlock +/obj/effect/map_helper/airlock + name = "use a subtype!" plane = 20 // I dunno just high. - alpha = 200 + alpha = 170 - var/area/my_area // The controller we're wanting our device to use var/obj/machinery/embedded_controller/radio/my_controller - var/my_controller_type = /obj/machinery/embedded_controller/radio/airlock/ + var/my_controller_type = /obj/machinery/embedded_controller/radio/airlock // The device we're setting up var/my_device var/my_device_type // Most things have a radio tag of some sort that needs adjusting var/tag_addon -/obj/effect/mapping_helpers/airlock/Initialize() +/obj/effect/map_helper/airlock/Initialize() ..() - my_area = get_area(src) - my_controller = locate() in my_area + my_controller = get_controller(get_area(src)) my_device = locate(my_device_type) in get_turf(src) if(!my_device) to_world("WARNING:Airlock helper '[name]' couldn't find what it wanted at: X:[x] Y:[y] Z:[z]") @@ -33,42 +32,71 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 setup() return INITIALIZE_HINT_QDEL -/obj/effect/mapping_helpers/airlock/Destroy() +/obj/effect/map_helper/airlock/Destroy() my_controller = null - my_area = null my_device = null return ..() -/obj/effect/mapping_helpers/airlock/proc/setup() +/obj/effect/map_helper/airlock/proc/get_controller(var/area/A) + if(!A) + return null + + var/list/potentials = list() + for(var/obj/O in A) + if(istype(O, my_controller_type)) + potentials += O + + //Couldn't find one + if(!potentials.len) + return null + + //Only found one + if(potentials.len == 1) + return potentials[1] + + //Gotta find closest + var/closest = potentials[potentials.len] + var/closest_dist = get_dist(src, closest) + potentials.len-- + while(potentials.len) + var/C = potentials[potentials.len] + potentials.len-- + var/dist = get_dist(src, C) + if(dist < closest_dist) + closest_dist = dist + closest = C + + return closest + +/obj/effect/map_helper/airlock/proc/setup() return // Stub for subtypes /* Doors */ -/obj/effect/mapping_helpers/airlock/door +/obj/effect/map_helper/airlock/door name = "use a subtype! - airlock door" my_device_type = /obj/machinery/door/airlock -/obj/effect/mapping_helpers/airlock/door/setup() +/obj/effect/map_helper/airlock/door/setup() var/obj/machinery/door/airlock/my_airlock = my_device my_airlock.lock() - my_airlock.frequency = my_controller.frequency my_airlock.id_tag = my_controller.id_tag + tag_addon - if(my_airlock.radio_connection) // Initialized before us - my_airlock.set_frequency(my_controller.frequency) + my_airlock.frequency = my_controller.frequency + my_airlock.set_frequency(my_controller.frequency) -/obj/effect/mapping_helpers/airlock/door/ext_door +/obj/effect/map_helper/airlock/door/ext_door name = "exterior airlock door" icon_state = "doorout" tag_addon = "_outer" -/obj/effect/mapping_helpers/airlock/door/int_door +/obj/effect/map_helper/airlock/door/int_door name = "interior airlock door" icon_state = "doorin" tag_addon = "_inner" -/obj/effect/mapping_helpers/airlock/door/simple +/obj/effect/map_helper/airlock/door/simple name = "simple docking controller hatch" icon_state = "doorsimple" tag_addon = "_hatch" @@ -78,51 +106,60 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 /* Atmos */ -/obj/effect/mapping_helpers/airlock/atmos +/obj/effect/map_helper/airlock/atmos name = "use a subtype! - airlock pump" my_device_type = /obj/machinery/atmospherics/unary/vent_pump -/obj/effect/mapping_helpers/airlock/atmos/setup() +/obj/effect/map_helper/airlock/atmos/setup() var/obj/machinery/atmospherics/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/mapping_helpers/airlock/atmos/chamber_pump +/obj/effect/map_helper/airlock/atmos/chamber_pump name = "chamber pump" icon_state = "pump" tag_addon = "_pump" +/obj/effect/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 + name = "air dump output" + icon_state = "pumpdout" + tag_addon = "_pump_out_external" + /* Sensors - did you know they function as buttons? You don't also need a button. */ -/obj/effect/mapping_helpers/airlock/sensor +/obj/effect/map_helper/airlock/sensor name = "use a subtype! - airlock sensor" my_device_type = /obj/machinery/airlock_sensor var/command -/obj/effect/mapping_helpers/airlock/sensor/setup() +/obj/effect/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.frequency = my_controller.frequency - if(my_sensor.radio_connection) // Initialized before us - my_sensor.set_frequency(my_controller.frequency) + my_sensor.set_frequency(my_controller.frequency) if(command) my_sensor.command = command -/obj/effect/mapping_helpers/airlock/sensor/ext_sensor +/obj/effect/map_helper/airlock/sensor/ext_sensor name = "exterior sensor" icon_state = "sensout" tag_addon = "_exterior_sensor" command = "cycle_exterior" -/obj/effect/mapping_helpers/airlock/sensor/chamber_sensor +/obj/effect/map_helper/airlock/sensor/chamber_sensor name = "chamber sensor" icon_state = "sens" tag_addon = "_sensor" command = "cycle" -/obj/effect/mapping_helpers/airlock/sensor/int_sensor +/obj/effect/map_helper/airlock/sensor/int_sensor name = "interior sensor" icon_state = "sensin" tag_addon = "_interior_sensor" @@ -132,5 +169,25 @@ Any frequency works, it's self-setting, but it seems like people have decided 13 Buttons */ -/obj/effect/mapping_helpers/airlock/buttons - name = "Just use a sensor instead. They are actually buttons." +/obj/effect/map_helper/airlock/button + name = "use a subtype! - airlock button" + my_device_type = /obj/machinery/access_button + var/command + +/obj/effect/map_helper/airlock/button/setup() + var/obj/machinery/access_button/my_button = my_device + my_button.master_tag = my_controller.id_tag + my_button.frequency = my_controller.frequency + my_button.set_frequency(my_controller.frequency) + if(command) + my_button.command = command + +/obj/effect/map_helper/airlock/button/ext_button + name = "exterior access button" + icon_state = "buttout" + command = "cycle_exterior" + +/obj/effect/map_helper/airlock/button/int_button + name = "interior access button" + icon_state = "buttin" + command = "cycle_interior" diff --git a/code/modules/mapping/mapping_helpers/baseturf.dm b/code/modules/mapping/map_helpers/baseturf.dm similarity index 100% rename from code/modules/mapping/mapping_helpers/baseturf.dm rename to code/modules/mapping/map_helpers/baseturf.dm diff --git a/code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm b/code/modules/mapping/map_helpers/network_builder/_network_builder.dm similarity index 76% rename from code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm rename to code/modules/mapping/map_helpers/network_builder/_network_builder.dm index 76e35d1f33f..80a9ba0a0de 100644 --- a/code/modules/mapping/mapping_helpers/network_builder/_network_builder.dm +++ b/code/modules/mapping/map_helpers/network_builder/_network_builder.dm @@ -1,6 +1,6 @@ //Builds networks like power cables/atmos lines/etc //Just a holder parent type for now.. -/obj/effect/mapping_helpers/network_builder +/obj/effect/map_helper/network_builder /// set var to true to not del on lateload var/custom_spawned = FALSE @@ -10,7 +10,7 @@ /// what directions we know connections are in var/list/network_directions = list() -/obj/effect/mapping_helpers/network_builder/Initialize(mapload) +/obj/effect/map_helper/network_builder/Initialize(mapload) . = ..() var/conflict = check_duplicates() if(conflict) @@ -25,17 +25,17 @@ 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/mapping_helpers/network_builder/LateInitialize() +/obj/effect/map_helper/network_builder/LateInitialize() scan_directions() build_network() if(!custom_spawned) qdel(src) -/obj/effect/mapping_helpers/network_builder/proc/check_duplicates() +/obj/effect/map_helper/network_builder/proc/check_duplicates() CRASH("Base abstract network builder tried to check duplicates.") -/obj/effect/mapping_helpers/network_builder/proc/scan_directions() +/obj/effect/map_helper/network_builder/proc/scan_directions() CRASH("Base abstract network builder tried to scan directions.") -/obj/effect/mapping_helpers/network_builder/proc/build_network() +/obj/effect/map_helper/network_builder/proc/build_network() CRASH("Base abstract network builder tried to build network.") diff --git a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm b/code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm similarity index 83% rename from code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm rename to code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm index 1983bab3b6d..811913ec970 100644 --- a/code/modules/mapping/mapping_helpers/network_builder/atmos_pipe.dm +++ b/code/modules/mapping/map_helpers/network_builder/atmos_pipe.dm @@ -1,7 +1,7 @@ /* 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/mapping_helpers/network_builder/atmos_pipe +/obj/effect/map_helper/network_builder/atmos_pipe name = "atmos pipe autobuilder" icon_state = "atmospipebuilder" @@ -16,8 +16,8 @@ color = null -/obj/effect/mapping_helpers/network_builder/atmos_pipe/check_duplicates() - for(var/obj/effect/mapping_helpers/network_builder/atmos_pipe/other in loc) +/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) @@ -30,7 +30,7 @@ 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/mapping_helpers/network_builder/atmos_pipe/scan_directions() +/obj/effect/map_helper/network_builder/atmos_pipe/scan_directions() var/turf/T for(var/i in GLOB.cardinals) if(i in network_directions) @@ -39,7 +39,7 @@ if(!T) continue var/found = FALSE - for(var/obj/effect/mapping_helpers/network_builder/atmos_pipe/other in T) + 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) @@ -54,7 +54,7 @@ return network_directions /// Directions should only ever have cardinals. -/obj/effect/mapping_helpers/network_builder/atmos_pipe/build_network() +/obj/effect/map_helper/network_builder/atmos_pipe/build_network() if(length(network_directions) <= 1) return var/obj/machinery/atmospherics/pipe/built @@ -79,7 +79,7 @@ built.on_construction(pipe_color, pipe_layer) built.hide(!visible_pipes) -/obj/effect/mapping_helpers/network_builder/atmos_pipe/distro +/obj/effect/map_helper/network_builder/atmos_pipe/distro name = "distro line autobuilder" pipe_layer = PIPING_LAYER_MIN pixel_x = -PIPING_LAYER_P_X @@ -87,7 +87,7 @@ pipe_color = rgb(130,43,255) color = rgb(130,43,255) -/obj/effect/mapping_helpers/network_builder/atmos_pipe/scrubbers +/obj/effect/map_helper/network_builder/atmos_pipe/scrubbers name = "scrubbers line autobuilder" pipe_layer = PIPING_LAYER_MAX pixel_x = PIPING_LAYER_P_X diff --git a/code/modules/mapping/mapping_helpers/network_builder/power_cable.dm b/code/modules/mapping/map_helpers/network_builder/power_cable.dm similarity index 62% rename from code/modules/mapping/mapping_helpers/network_builder/power_cable.dm rename to code/modules/mapping/map_helpers/network_builder/power_cable.dm index 88fdeee6a45..77fddc05468 100644 --- a/code/modules/mapping/mapping_helpers/network_builder/power_cable.dm +++ b/code/modules/mapping/map_helpers/network_builder/power_cable.dm @@ -3,7 +3,7 @@ #define KNOT_FORCED 2 /// Automatically links on init to power cables and other cable builder helpers. Only supports cardinals. -/obj/effect/mapping_helpers/network_builder/power_cable +/obj/effect/map_helper/network_builder/power_cable name = "power line autobuilder" icon_state = "powerlinebuilder" @@ -15,17 +15,17 @@ /// cable color as from GLOB.cable_colors var/cable_color = "red" -/obj/effect/mapping_helpers/network_builder/power_cable/check_duplicates() +/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/mapping_helpers/network_builder/power_cable/other in loc) + 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/mapping_helpers/network_builder/power_cable/scan_directions() +/obj/effect/map_helper/network_builder/power_cable/scan_directions() var/turf/T for(var/i in GLOB.cardinal) if(i in network_directions) @@ -33,7 +33,7 @@ T = get_step(loc, i) if(!T) continue - var/obj/effect/mapping_helpers/network_builder/power_cable/other = locate() in T + var/obj/effect/map_helper/network_builder/power_cable/other = locate() in T if(other) network_directions += i other.network_directions += turn(i, 180) @@ -45,7 +45,7 @@ return network_directions /// Directions should only ever have cardinals. -/obj/effect/mapping_helpers/network_builder/power_cable/build_network() +/obj/effect/map_helper/network_builder/power_cable/build_network() if(!length(network_directions)) return else if(length(network_directions) == 1) @@ -69,118 +69,118 @@ new /obj/structure/cable(loc, cable_color, NONE, network_directions[i]) do_knot = FALSE -/obj/effect/mapping_helpers/network_builder/power_cable/proc/should_auto_knot() +/obj/effect/map_helper/network_builder/power_cable/proc/should_auto_knot() return (locate(/obj/machinery/power/terminal) in loc) -/obj/effect/mapping_helpers/network_builder/power_cable/knot +/obj/effect/map_helper/network_builder/power_cable/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/auto +/obj/effect/map_helper/network_builder/power_cable/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Red -/obj/effect/mapping_helpers/network_builder/power_cable/red +/obj/effect/map_helper/network_builder/power_cable/red color = "#ff0000" cable_color = "red" -/obj/effect/mapping_helpers/network_builder/power_cable/red/knot +/obj/effect/map_helper/network_builder/power_cable/red/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/red/auto +/obj/effect/map_helper/network_builder/power_cable/red/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // White -/obj/effect/mapping_helpers/network_builder/power_cable/white +/obj/effect/map_helper/network_builder/power_cable/white color = "#ffffff" cable_color = "white" -/obj/effect/mapping_helpers/network_builder/power_cable/white/knot +/obj/effect/map_helper/network_builder/power_cable/white/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/white/auto +/obj/effect/map_helper/network_builder/power_cable/white/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Cyan -/obj/effect/mapping_helpers/network_builder/power_cable/cyan +/obj/effect/map_helper/network_builder/power_cable/cyan color = "#00ffff" cable_color = "cyan" -/obj/effect/mapping_helpers/network_builder/power_cable/cyan/knot +/obj/effect/map_helper/network_builder/power_cable/cyan/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/cyan/auto +/obj/effect/map_helper/network_builder/power_cable/cyan/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Orange -/obj/effect/mapping_helpers/network_builder/power_cable/orange +/obj/effect/map_helper/network_builder/power_cable/orange color = "#ff8000" cable_color = "orange" -/obj/effect/mapping_helpers/network_builder/power_cable/orange/knot +/obj/effect/map_helper/network_builder/power_cable/orange/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/orange/auto +/obj/effect/map_helper/network_builder/power_cable/orange/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Pink -/obj/effect/mapping_helpers/network_builder/power_cable/pink +/obj/effect/map_helper/network_builder/power_cable/pink color = "#ff3cc8" cable_color = "pink" -/obj/effect/mapping_helpers/network_builder/power_cable/pink/knot +/obj/effect/map_helper/network_builder/power_cable/pink/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/pink/auto +/obj/effect/map_helper/network_builder/power_cable/pink/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Blue -/obj/effect/mapping_helpers/network_builder/power_cable/blue +/obj/effect/map_helper/network_builder/power_cable/blue color = "#1919c8" cable_color = "blue" -/obj/effect/mapping_helpers/network_builder/power_cable/blue/knot +/obj/effect/map_helper/network_builder/power_cable/blue/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/blue/auto +/obj/effect/map_helper/network_builder/power_cable/blue/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Green -/obj/effect/mapping_helpers/network_builder/power_cable/green +/obj/effect/map_helper/network_builder/power_cable/green color = "#00aa00" cable_color = "green" -/obj/effect/mapping_helpers/network_builder/power_cable/green/knot +/obj/effect/map_helper/network_builder/power_cable/green/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/green/auto +/obj/effect/map_helper/network_builder/power_cable/green/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO // Yellow -/obj/effect/mapping_helpers/network_builder/power_cable/yellow +/obj/effect/map_helper/network_builder/power_cable/yellow color = "#ffff00" cable_color = "yellow" -/obj/effect/mapping_helpers/network_builder/power_cable/yellow/knot +/obj/effect/map_helper/network_builder/power_cable/yellow/knot icon_state = "powerlinebuilderknot" knot = KNOT_FORCED -/obj/effect/mapping_helpers/network_builder/power_cable/yellow/auto +/obj/effect/map_helper/network_builder/power_cable/yellow/auto icon_state = "powerlinebuilderauto" knot = KNOT_AUTO diff --git a/icons/map/mapping_helpers.dmi b/icons/map/mapping_helpers.dmi index f77f99c8efc2b70c6d4ea5184cc86e9c0da4e221..7667a2e2144f3fa650ee55d5560022003de9e836 100644 GIT binary patch literal 8445 zcmXY1bzD@>*S4Pou-w*#Dc-5bC#RCAy(*Oe# zZzX##+c&Q~ykEJ$1_1w@+>i1uSb}6xW7*b%TZS5zyfXXBsVnlB9ttsAzdx?*k14-} zEJlp;QEAQ05_cSSiaqlBvnP9@`iJRaC;SnGl#|WvNks(@{dQrPVRZ%5c4Nj3g))%> zc4KA*aTNajCx$*G0ev@UUXMAm;0e>*GMlysGY7v-o7Ud7sO}1)Lw7d|)?dq=z7HUq zKHmCUn36t6FI7lHW30(%GyJPEAbrcUAZ$HA55dna>!{#jrbxPEW_YihKqVA(pw{1lntaM}2UR4Qqzu$biOYpa1zTHIaq$&uf~p6|?rsVT zi1-SF1>_|aQ=(&H|0=l*(-_llw^)08mEcgZ3_j{+I404yKhlYzkDLioSW6ZXOx<(Z z3XwCkwOytBkWHN;Py)E~S#saOy{X93d~5^+$!C?5dBUQSB17!?q4=Sk3jQunk!esC zC0DHb?CkG4J_gGQ&3-TZ5Vx#MJO2AG$?}MIlTVAS{{${jZZltJqSQy2w09cSA->n0 z9L8?fx`r)h==)4Ifmpcywf->68x9jHMQiqgrF7mRv{yH;xzdTgr1q|K^QtYKA*p;L|mPDN&V*c?-9UU7@`FAru~0^~B-<8)fZ^dBM%S$ljFx zouVJZ`o6t{P?tR&h6fMEvL?tx$}=S#@_Wf2#w@jLECTqbmJJxLoa}1`ZB=JnU2eel3p0Rc7%D zy2Dl+jgpe@Z0*pjyev~q?#)L;oSr5?esQw!2;u7Sg!ZqZV(ITsV2iLV^&H|GjNICB zY0Ma5+lJQ|lo7nKQlE7mzO{R$Yw4Y78lUik;NG5RA)N z^WXCj3Kp051svXMEV`|13Xtn@h30M~rg+@$C9NgJ@&tO`?vd@Xdn(1mP>13p<~K;m z76@AC4AnoE6<0StbdxwN1RHRK9VFtQ$x=Zc+I%E-f1l#RD5VmSq`ux|q91Rpme-%? z7^={yRU#*T_;bncgyY(W&#iB1@FQ=ooQMA?4U2a#E98oDL-x;%!lb$d<3H&Fou2To zsi9Kct9W`+-A27zk2CITAaj>IBSArbFjWp=BhtS)|D%-dTDn>v*T&60*m_na2{COw%82);9}dLJrl)pr;A8dR%kd@5su}Hu{e^y z@;O`f?2$wVU&jW&=yRVa6`0ad!gr*Mfs`cRG9yGq9#T$@bZ+_~E@7~A!{IRo1qxR3 z)Z`e#f~Q&nP9FS#+rOjWu4^w@>>z zvVPr%*aH&OdbdtrxY&QR--;wOoi>yGag7iX(n~&P7_X-RS}|IxSl=V{GIX;5%b=;m z^f+ujX7*CH$PWBpU6Zwtj4@&5h6i>(;7PRvAk9o27y5rct`0ZMi{+ z-SofQAnE*w6}g|w8p`Ffpm*`aEN?hn^C2V@fcnG{MQ25ipV;}14v4M)&$_6|p7tz48)VJ2v>1c^e{Tk9 zS>|5h+N<$!DuR{*p*b*|+H$Cdey69`KnH+_7vJX;X~EwlPQ!@MIhSTZw{E~VmHlH_ z$d)r_0*bQ0BCm2}! z^H2V^m$m7PQNo|73Ibt&EV^zVsoA2~U&xPm6g!WHm;QF6E;1FE3k-G$xJvMEC0;}Fl)clp2-fI{bv%8EA6eHg?r#G$*COmyAzG2 z%_K?h{e+B3(6%F`gUe0^dKdzXd*{ zd|-l0=Ycx1(7yLiL`&-#&aF!S4a5c)9hYRJ`);4tUcO%@BP9%yL7EaYC+N!wazV)V z_ecc^^WK9jLIFYy_p`))#ltVn9bvl{)A)AgcK-}WzSJBL1Yui3zo0mxXcFeA@Eh-; zGtZ|YISirLaFVgo;uW5pu*%qfJ(*#I)(ZRLo( zWkacVQAekJZP(oao;g`q2Di7y!>5N+Yn@Fw7>Q5_p$5i)!fD5n_323{R&N^`l9dj)%{y< zH+QY({`zd}3wzr0k4s{K*T`0Oe#};F&0STGR{AMrUHhH?rr6CLQDW!G0y!{vrd#Ms zF_G8Bcc{@W?N;%%3o-lkiOl3}I?cA*c1>@?BlVN<^An8yZRh)FT1%v|yI6zy$wZbH z*5ustWN&9lroi>i#HtO);9HV)o$bR5tM}h-Y6F>;TD+%UprY{jy8a0yrn|BIDKsC= zIu-N~osmc^{6hJL!ETuUZ$>a50zE$5S(gmMC$3q1h32}QUvLpU$qv9o6v=7Kd@ehO z6kT`mVe)H_vR}Fv6hsO1V7?`1_@3od@{WD7ZqT`ty}8p$GdgYTf=3^JKJ!6EE%Lz| z4-qw`WX>|Aq4wLEg^7atQXKl@J|kTr&)M3Xj;D64L6I$ywA@JH(U5BO;wM?VgHR8Jw327@bO=)Yctqn>l&U;dfXU zk$-+J6@$s*WKkZ?7oD=yv3hcV(1RP|>NcXT+dH7Ny!a+6!q4|rl&(3-kNt$FQ%U*T zL&3re-~E5pM(=yRg5tKaITHBq=|h1#m#}0Y*wU&*%V(MhEB)LrFk=E9Yk3KyfGbwY zQwL-Q$hX)>p(Tt$kC^G56u@e?;Y6brEPYo83p+YIAzn3at)OJv3D5Tsz!!cD@kWkXerV2Bphu^vtn z(tn&GyDNF>n`Ls$J06VPvpi_)qi2tcm`m?n!dR=^UNi`ARuvg+udbgr440WT40MkyuoX_5FY=$3?`K zhNXP4n${^v7UuxNcxN za~aV!*%&9veS%kZN&B8BaKiV*3v{>Qo2&AMs*ayLqG*i1e@fTg-D?EJ04fTnFyZmZUh4Cng_6382oyJz{o_?QRW zzHP0OtB(hQh#VTCk!gBcdw)8F*R4WI+4q)95)<-NFnz@vZpd6vJ47UpY=|AKxjwuX z{OQwP1s?RAla;k*3_yzQv@dH!o;4Bb;h;_x-)XYOh}=EL^P~0=o-T<4%@quSq-Zm+-ZKOJR$j|9aC1*U)b7VFiAPyH z?Onp<;;01dkd7qePCIE^AtO2My)zmN#X;uN+7iC6Y|PQH5WLOJhbgJh^1a(uFV~Jc z7o{ujJIr*s*TiD=lSu7lV@nb(F&3Fgt&ZJn>@>b-**i7NATl2RhZDmRw|2pPzd@UA z?)uPV;~$Z@AGDRO19CdUN&fKKRqPVsH;J#{a2Kv%E|8*AB2%0YF!x&&P^lbP^ zEDukt5>K;x^Yga5SY;-IQ=jky;RhJ*%0onsHQ5oqgbEo{Ie?`TK0+?H&Hg{)2e*zH z$=QkYQzo$aw~=hca(1pQ7xeKX)F`$EPRBOUwrJo2Fu}bFH2(_9LFlwxrz-suV#!Vx zOgZ4(v6mk7>vq+WYvqx3{AbYsC9LLltd_!})n3%dD&CPQh2?}7W_v`!;dBz;B4i*k zgB(6D)ibd2SZ23=N?7LwuRkpGF)P|TGi!PbRlVx>=a!Tl4!X-P68GI|uj<$oAI)?y zcHwpZ&u=M*dCjv9$+qXeT~e9p%$aM*ZpY_7_M?h7{l>vncWO1Ty#xV?oxIZ^p^hyq zc&aBQxa}%h{C&SG1A}h=@_w?oaJA|Ysp5z8WvbAi=F(!6Spwt#6;r_qJW4jsYCCca zOwrb|p4^dnBq1Lr!hNf8TZD-8-`4Q?ig!vY-T$~+wx3__A zqQ#uI`tMXOz66uA9r?sD#-U=W_?-tjV00b*`xsos?CIRs@-8F4K*)<;1~$&Q@#R=N z#16f>epi_#x6B|`>9m^H)8AT(rPetoQKepFs3W|Y=|j9J24C=R!B_k;sjRMG*HnQEnYl+QAetG`+<;HNPxaW$}<0%hupn^4& zDSM>KHfNwVYGOi9^OFFCFN26LV`y(j!c}QlmKjM1?<7;ku#Vuo)uu@Jq^Jqr(tyi& zv{|TWYDRL#9if7jb(TDyygWbwzQ-=zo2Sd);~&sHd?@nOnItO2Bje#n=I6Ie&eb&iunPM6OhudSmr`fndd89Ue zaDR5R1~d*yVQOkxl}$E@ukpSpJ>OF6Dpiyfuq9Amzqpu^UBqsvvunV@3&~GTu3m3hJSSOYmT0qqfdOQ~Ln&QL%lLlg5XQ+eEuqE$t)ztv(GXA**WD=7)9m~6Z^L@lqY?gZ zEF}s6%7rc zFaDzugwL)KkhHLGgw@jsb{S!C>6hBYV|cnFq#;dh>}mG!pr{s&#T((1UJQB@wpfiK z#a;6Knw*>*Hae`4);n7R5D z0U;4l)M|g?dl3;4PF`MW2(oItgfJv&+;q^LtqF_>Cro-5eU-fNnV*}xXYX%g@15S% z)YPB47ub35>sM5?w5%c`)Id^JR@}M<~|!D7|adxK0D&K^5-rC+KfA;KI>7j6lme&2J zpt8p}T9FelvYYFhkn0*P%?lnmDA9D7UOo&a6^t&57CpqRWB)1vo67hV51yuJO6FQ> z=dEj`@#Y&gd6MSRL>%#~^<&Icz2cqWL0S20(Rg(qG?J^Y>2!J!c7qi2qUaL!6aWC- z1OOHt{^VdR6&)Pd0Vo@r@^$b^Uo4q2`E;#yG!!3%zM7g^C=~xEMck}A!gA8Cz-=E) zyGN|7tga7Y!@>Ai%(Z!OG&D5mnwc@Ay;2~``R#7jpJ~sqzOnIcRjjX=0hh(}EjH?J zE!VnZzCgEF^qM2)2wC$1+={iSjW0AFltu&`%4H^?uZF&m+Zuv}*dn`#V{Oq7{YP=i z?|-xikE6RDIN_$A_VSESlXaYqN~vl87JKM%v1bY(cWV&|fd_4Plb?0^qljpay78C+ zU^GVp8xZ$DDp*0q#>VRRIoa9az|cq70fB+kiEQD|Jg(1PS-L%jw!8)1y{7FVTrk`0 zwK+=0SGmbPykR^?8MOJKWdBzcH=u_43z^f@EC@v%(*ulGV`yHmHt3Doo#%XI{xFp} zKXvdjk-K_|BT&o5@s@rvM3~wOW~!kQZs`4&6#=V%zd4hAYYQ7%yuqH}}W8;x54e=wCbaY5#NSDq7l2cP7lat9`)#pI*K^g+1 zK!yV$ARxH9yE!xr24?Du-2=p*hqp{aaN?l>HA0Lqa!DJ_qtqWo>(i5bZ17^~fP7Li zQCQ%=vbJsH*>lLy$*MI6>bMas>_4S3-^zl;HB-Z(N7F_zpjhHSm`8yb&6TPL z6a35P){oW%Z|>9z0|j$b;J$-h=}{Vn`6d(uCa06oQ@}Su=`EHUnR=h18yqC%2K>Zf zfONMhLewLj?=lN z#{3{bJ`xlp2jT8uT=}4{{;{Cv&l@v0-vJcC-i8=uK!$=zdcKUxRRl8NdB=>VN5@fi zYyqCVHMkdOzq;Q!vl`HI-l5@gLk%+Yh8Qu2TU;ya1rtdXsyJ+U6C2pra7?6zGid*% z(ivt>7)Zu{sIv(zP%H`a`?lCTittkT`NA1fTZld~I(`sEDf%tNq$4+(mJJT|9buNU z#qn^42YdxBjnq13+(3dMX%b*MS$z-&&h%2k`?fy5{3Dg@;6JrVx|zXRTJSAn5%m88+c=1s{CmkcBlAoX0%ZukNs={>dusd| zM9KPN6~AXyDsg;IqJ6?MRLXHCI7#rNI0>{K+b0tu=F#m%aw=(|L?Nz<2L{~A#=itu znD78iGQ#4GGSqrPy;-)i#a(oI#`THM@wRrNb}E$dzoUNHwPf0pzkFY{OP_a|nR-m+#zo_KuWT4S$!TW7=-X#I$Xt*0=LHrQZxYrA-gi#}!_srnzTxH}>^RY_9^92E}5R2sE!PZ1AoWLWB##Hs-2@Yl^0Tb8)xmvbhon|1fz zQ9*M;%}a5dT@=pnpZ|CMSbHf)F!Ik--U#O0gm&T<0iRh{E3!&b;rd0HMm$S zeqlx>=zwC~0MsfZK|8_4l+og|4#gq*7*OQ_kZ^Y41ysKjV=chQXw-9*u11n@90}$4 zMB2)Dd`}&6)x(qEuf&3+wesxaFCh>0f%}t?(CB)HtGDpBJ>}F=+2&eZ^5E9YC)jv? z$XJgv*<0Z7T4{Nyjvzy-*gX8)v3)7-81I*8_f|mQ8!(JOm10kB75h3uHyW za*>qA1XJ^g(?zd}_e;7hYT3r#?$E9z0hc@f$RdIgs=ss;lAr*^D;E9%34I+A`L0BzyM1=c9;mcfx1?Gcw?XBPpGhs3f%ggZIR>oZK4y zHhvFp67h7pQ?Q`aRYVZL(HG4+5@{19QATrzo0Arwz^K?dS@pqt*?+CyDQYNp;IO=j z(;@5Sn?7?Lb>LQ9p<{8{te6!^CWKwVi| KsYbyj{Qm&AnRN*O literal 8345 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 T8yx@10idmJpjN43`|5uH*wbzK diff --git a/icons/obj/airlock_machines.dmi b/icons/obj/airlock_machines.dmi index 0c4643269cdfbb2b50c9aeb20e2aa68a30cdf4fa..c3b62889afce56c1ea2fc1c579cc1aa35e4111ae 100644 GIT binary patch literal 5053 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