diff --git a/_maps/map_files220/MetaStation/MetaStation.dmm b/_maps/map_files220/MetaStation/MetaStation.dmm index e7e8735ae845..55cfbd2888b7 100644 --- a/_maps/map_files220/MetaStation/MetaStation.dmm +++ b/_maps/map_files220/MetaStation/MetaStation.dmm @@ -4345,22 +4345,19 @@ /area/station/supply/miningdock) "ayH" = ( /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/door_control/shutter/east{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - req_access_txt = "31" - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" - }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/supply/qm, +/obj/machinery/door/airlock/command/glass, +/obj/effect/mapping_helpers/airlock/access/all/command/general, +/turf/simulated/floor/plasteel, /area/station/supply/storage) "ayI" = ( /obj/structure/cable/yellow{ @@ -4630,23 +4627,11 @@ /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) "azN" = ( -/obj/machinery/computer/supplycomp{ - dir = 1 - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 8; - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "brown" +/obj/structure/chair/office/dark{ + dir = 8 }, +/obj/effect/landmark/start/quartermaster, +/turf/simulated/floor/plasteel, /area/station/supply/qm) "azO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -4853,7 +4838,7 @@ /obj/machinery/light/directional/east, /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel{ - dir = 8; + dir = 9; icon_state = "brown" }, /area/station/supply/storage) @@ -5246,6 +5231,11 @@ /area/station/engineering/control) "aCH" = ( /obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, /obj/effect/spawner/window/reinforced/polarized/grilled{ id = "Processing" }, @@ -6788,14 +6778,6 @@ icon_state = "darkgrey" }, /area/station/telecomms/computer) -"aIQ" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/north, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "browncorner" - }, -/area/station/supply/storage) "aIS" = ( /obj/item/stack/sheet/plasteel{ amount = 10; @@ -7295,6 +7277,9 @@ icon_state = "4-8" }, /obj/effect/turf_decal/delivery/white/hollow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aKj" = ( @@ -8222,18 +8207,9 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "aMW" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, -/obj/effect/landmark/start/quartermaster, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" - }, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -8291,19 +8267,21 @@ /area/station/supply/office) "aNb" = ( /obj/structure/table, -/obj/item/pen/red, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 4 - }, -/obj/item/folder/yellow, -/obj/item/paper_bin/nanotrasen, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/machinery/keycard_auth, +/obj/item/clipboard, +/obj/item/stamp/granted{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/item/stamp/qm, +/obj/item/stamp/denied{ + pixel_x = 7; + pixel_y = -6 + }, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "brown" @@ -8585,12 +8563,12 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 }, +/obj/item/radio/intercom/directional/east, /obj/structure/cable/yellow{ d1 = 1; - d2 = 2; - icon_state = "1-2" + d2 = 8; + icon_state = "1-8" }, -/obj/item/radio/intercom/directional/east, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -8940,23 +8918,14 @@ /area/station/engineering/engine/supermatter) "aPw" = ( /obj/structure/table, -/obj/item/clipboard, -/obj/item/stamp/granted{ - pixel_x = -7; - pixel_y = 6 - }, -/obj/item/stamp/qm, -/obj/item/stamp/denied{ - pixel_x = 7; - pixel_y = -6 - }, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; name = "Cargo Requests Console"; pixel_y = 30 }, -/obj/machinery/photocopier/faxmachine{ +/obj/machinery/photocopier/faxmachine/longrange{ + pixel_y = 4; department = "Quartermaster's Office" }, /turf/simulated/floor/plasteel{ @@ -9066,20 +9035,12 @@ /turf/simulated/floor/plasteel, /area/station/supply/qm) "aPR" = ( -/obj/machinery/door_control/shutter/west{ - id = "qm_warehouse"; - name = "Warehouse Door Control"; - req_access_txt = "31" - }, /obj/structure/table, /obj/machinery/kitchen_machine/microwave{ pixel_y = 6 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/light_switch/west{ - dir = 4; - pixel_y = -8 - }, +/obj/structure/extinguisher_cabinet/directional/west, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aPS" = ( @@ -9260,21 +9221,6 @@ }, /turf/space, /area/space/nearstation) -"aQG" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/supply/qm, -/obj/machinery/door/airlock/command/glass, -/turf/simulated/floor/plasteel, -/area/station/supply/qm) "aQI" = ( /obj/structure/cable/yellow{ d1 = 1; @@ -9830,9 +9776,6 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "aSz" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -9914,10 +9857,19 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aSK" = ( -/obj/structure/closet/crate, -/obj/effect/turf_decal/delivery/hollow, +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/stack/sheet/cardboard, +/obj/item/stack/rods{ + amount = 50 + }, +/obj/item/paper, +/obj/item/storage/box/lights/mixed, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aSM" = ( @@ -10228,21 +10180,6 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/engine, /area/station/engineering/engine/supermatter) -"aTW" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/stack/sheet/cardboard, -/obj/item/stack/rods{ - amount = 50 - }, -/obj/item/paper, -/obj/item/storage/box/lights/mixed, -/obj/effect/decal/cleanable/dirt, -/obj/structure/extinguisher_cabinet/directional/west, -/turf/simulated/floor/plasteel, -/area/station/supply/storage) "aTX" = ( /obj/effect/landmark/spawner/nukedisc_respawn, /obj/effect/decal/cleanable/dirt, @@ -10630,24 +10567,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"aUT" = ( -/obj/structure/table, -/obj/machinery/camera{ - c_tag = "Cargo Bay - Starboard"; - dir = 8 - }, -/obj/item/toy/figure/crew/cargotech{ - pixel_x = 3 - }, -/obj/item/stamp/granted{ - pixel_x = -6; - pixel_y = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "brown" - }, -/area/station/supply/storage) "aUU" = ( /obj/structure/window/reinforced, /turf/space, @@ -11134,6 +11053,9 @@ dir = 4 }, /obj/effect/turf_decal/delivery/white/hollow, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "aWm" = ( @@ -11311,7 +11233,6 @@ }, /area/station/engineering/smes) "aWO" = ( -/obj/item/stack/sheet/cardboard, /obj/effect/turf_decal/delivery/hollow, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -12498,27 +12419,18 @@ /turf/simulated/floor/plasteel, /area/station/engineering/control) "baC" = ( +/obj/item/radio/intercom/directional/east, /obj/structure/table, -/obj/item/folder/yellow{ +/obj/item/stamp/granted{ pixel_x = -6; - pixel_y = 4 - }, -/obj/item/folder/yellow{ - pixel_x = -7; - pixel_y = -6 - }, -/obj/item/radio/intercom/directional/east, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 1 - }, -/obj/item/paper_bin{ - pixel_x = 8; pixel_y = 6 }, -/obj/item/paper_bin{ - pixel_x = 8; - pixel_y = 11 +/obj/item/toy/figure/crew/cargotech{ + pixel_x = 3 + }, +/obj/machinery/camera{ + c_tag = "Cargo Bay - Starboard"; + dir = 8 }, /turf/simulated/floor/plasteel{ dir = 8; @@ -12555,17 +12467,21 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 }, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, /obj/structure/cable/yellow{ d1 = 2; d2 = 4; icon_state = "2-4" }, /obj/effect/turf_decal/delivery/white/hollow, +/obj/structure/disposalpipe/segment{ + dir = 1; + icon_state = "pipe-c" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "baI" = ( @@ -17158,8 +17074,9 @@ /area/station/security/storage) "bmN" = ( /obj/structure/table/reinforced, -/obj/machinery/photocopier/faxmachine{ - department = "Chief Engineer's Office" +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Chief Engineer's Office"; + pixel_y = 4 }, /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -18639,11 +18556,12 @@ /area/station/hallway/primary/starboard) "bqG" = ( /obj/structure/table/glass, -/obj/machinery/photocopier/faxmachine{ - department = "Chief Medical Officer's Office" - }, /obj/machinery/economy/vending/wallmed/directional/west, /obj/machinery/light_switch/north, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Chief Medical Officer's Office"; + pixel_y = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whiteblue" @@ -21416,8 +21334,9 @@ "byo" = ( /obj/structure/window/reinforced, /obj/structure/table/wood, -/obj/machinery/photocopier/faxmachine{ - department = "Head of Personnel's Office" +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Head of Personnel's Office"; + pixel_y = 4 }, /turf/simulated/floor/wood, /area/station/command/office/hop) @@ -33348,6 +33267,15 @@ icon_state = "whitebluecorner" }, /area/station/medical/medbay) +"cmk" = ( +/obj/machinery/computer/supplycomp{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "brown" + }, +/area/station/supply/qm) "cmm" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralcorner" @@ -45347,6 +45275,17 @@ }, /turf/simulated/floor/engine, /area/station/maintenance/turbine) +"dmr" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/keycard_auth/east, +/turf/simulated/floor/plasteel, +/area/station/supply/qm) "dmE" = ( /obj/machinery/conveyor/north{ id = "QMLoad" @@ -46815,6 +46754,18 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plasteel, /area/station/security/brig) +"eak" = ( +/obj/structure/cable/yellow, +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "Processing" + }, +/obj/structure/cable/yellow{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/turf/simulated/floor/plating, +/area/station/supply/storage) "eaG" = ( /obj/structure/sign/poster/official/random/east, /turf/simulated/floor/plasteel{ @@ -48102,11 +48053,14 @@ }, /area/station/security/storage) "eEy" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "Processing" }, -/turf/simulated/floor/plasteel, +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" + }, +/turf/simulated/floor/plating, /area/station/supply/storage) "eFw" = ( /obj/machinery/door/firedoor, @@ -48934,6 +48888,19 @@ icon_state = "white" }, /area/station/science/toxins/launch) +"eZC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/light_switch/west{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/supply/storage) "eZE" = ( /obj/item/radio/intercom/directional/south, /turf/simulated/floor/plasteel{ @@ -53111,6 +53078,14 @@ icon_state = "dark" }, /area/station/turret_protected/aisat/interior) +"gXp" = ( +/obj/structure/disposalpipe/sortjunction{ + dir = 1; + name = "Quartermaster Junction"; + sort_type_txt = "3" + }, +/turf/simulated/floor/plasteel, +/area/station/supply/storage) "gXJ" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -56491,6 +56466,13 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/security/brig) +"iuZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 8; + icon_state = "pipe-c" + }, +/turf/simulated/floor/plasteel, +/area/station/supply/storage) "ivn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -60755,13 +60737,19 @@ /turf/simulated/floor/engine, /area/station/engineering/control) "kBn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/effect/spawner/window/reinforced/polarized/grilled{ + id = "Processing" }, -/obj/item/kirbyplants{ - icon_state = "plant-21" +/obj/structure/cable/yellow{ + d2 = 8; + icon_state = "0-8" }, -/turf/simulated/floor/plasteel, +/obj/structure/cable/yellow{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plating, /area/station/supply/storage) "kBs" = ( /obj/machinery/alarm/directional/north, @@ -67058,6 +67046,12 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/office) +"niu" = ( +/obj/effect/turf_decal/delivery/hollow, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate, +/turf/simulated/floor/plasteel, +/area/station/supply/storage) "niv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -68289,20 +68283,6 @@ }, /turf/simulated/floor/carpet, /area/station/science/robotics/showroom) -"nLH" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" - }, -/turf/simulated/floor/plasteel, -/area/station/supply/storage) "nLV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -68522,17 +68502,20 @@ }, /area/station/service/chapel/office) "nSQ" = ( -/obj/machinery/computer/security/mining{ - dir = 1 +/obj/structure/table, +/obj/item/folder/yellow{ + pixel_x = -7; + pixel_y = 15 }, -/obj/structure/cable/yellow{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/item/folder/yellow{ + pixel_x = 7; + pixel_y = 15 }, +/obj/item/paper_bin/nanotrasen, +/obj/item/pen/red, /turf/simulated/floor/plasteel{ dir = 4; - icon_state = "browncorner" + icon_state = "brown" }, /area/station/supply/qm) "nTF" = ( @@ -68992,6 +68975,9 @@ icon_state = "red" }, /area/station/security/brig) +"odb" = ( +/turf/simulated/floor/plasteel, +/area/station/supply/qm) "odw" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -80139,11 +80125,12 @@ /area/station/engineering/equipmentstorage) "tvd" = ( /obj/structure/table/wood, -/obj/machinery/photocopier/faxmachine{ - department = "Head of Security's Office" - }, /obj/machinery/power/apc/directional/south, /obj/structure/cable/yellow, +/obj/machinery/photocopier/faxmachine/longrange{ + department = "Head of Security's Office"; + pixel_y = 4 + }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/hos) "tve" = ( @@ -81251,7 +81238,8 @@ /obj/machinery/light/directional/west, /obj/machinery/light_switch/west, /obj/structure/table, -/obj/machinery/photocopier/faxmachine{ +/obj/machinery/photocopier/faxmachine/longrange{ + pixel_y = 4; department = "Research Director's Office" }, /turf/simulated/floor/plasteel{ @@ -82011,11 +81999,6 @@ /turf/simulated/wall, /area/station/engineering/controlroom) "uxV" = ( -/obj/structure/disposalpipe/sortjunction{ - dir = 1; - name = "Quartermaster Junction"; - sort_type_txt = "3" - }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, @@ -82027,6 +82010,10 @@ d2 = 8; icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "uxY" = ( @@ -82477,6 +82464,11 @@ id_tag = "qm_warehouse"; name = "Warehouse Shutters" }, +/obj/machinery/door_control/shutter/north{ + id = "qm_warehouse"; + name = "Warehouse Door Control"; + req_access_txt = "31" + }, /turf/simulated/floor/plasteel, /area/station/supply/storage) "uKT" = ( @@ -86516,10 +86508,6 @@ }, /area/station/science/storage) "wNA" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" - }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/yellow{ @@ -86527,6 +86515,7 @@ d2 = 8; icon_state = "1-8" }, +/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/supply/storage) "wNL" = ( @@ -87519,11 +87508,13 @@ }, /area/station/science/xenobiology) "xlE" = ( -/obj/structure/cable/yellow, -/obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "Processing" +/obj/machinery/computer/security/mining{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "browncorner" }, -/turf/simulated/floor/plating, /area/station/supply/qm) "xlS" = ( /obj/machinery/atmospherics/unary/outlet_injector/on{ @@ -107594,7 +107585,7 @@ aKf fGO rUN azO -nLH +azO baF aSN azR @@ -107851,7 +107842,7 @@ aVl jyW ueF aCH -aYl +eak aKi aRo cjv @@ -108364,10 +108355,10 @@ aOB aPw aMW azN -xlE +cmk eEy uxV -aOu +gXp aOu aYh aOu @@ -108620,11 +108611,11 @@ rwj aOB aLS aMZ +odb aNm -aVl -aIQ +aZt aSz -aRo +aYl aRo aYl aWM @@ -108877,12 +108868,12 @@ fuy cli aLQ aNY +dmr aPM -aQG ayH wNA +iuZ aRo -aUT aAX baC aTL @@ -109137,12 +109128,12 @@ aOB aOB aOB aZt +aZt uKy aUt aZt aZt aZt -aZt bjl hTj xOj @@ -109394,9 +109385,9 @@ frx tWP aOB aPR -aWt +eZC +gqF gqF -aTW aMT bgy aZt @@ -110679,7 +110670,7 @@ aLW aNe aZt aMH -bsi +niu bsi gqF gqF