From 968d3d391f181ac13fc8fcd7a6582d5ce186c5d7 Mon Sep 17 00:00:00 2001 From: Mikhail Dzianishchyts Date: Wed, 11 Dec 2024 17:47:56 +0300 Subject: [PATCH] Remove EXPERIMENTOR from maps --- .../RandomZLevels/blackmarketpackers.dmm | 2 +- .../map_files220/RandomZLevels/blackmesa.dmm | 2 +- _maps/map_files220/RandomZLevels/caves.dmm | 4 - _maps/map_files220/generic/centcomm.dmm | 2 +- _maps/map_files220/stations/boxstation.dmm | 809 +++---- _maps/map_files220/stations/deltastation.dmm | 548 ++--- _maps/map_files220/stations/metastation.dmm | 2149 +++++++---------- modular_ss220/aesthetics/racks/code/racks.dm | 3 + modular_ss220/maps220/code/directions.dm | 37 - 9 files changed, 1387 insertions(+), 2169 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm index 0e2241bda2e2..570b1bf8221e 100644 --- a/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm +++ b/_maps/map_files220/RandomZLevels/blackmarketpackers.dmm @@ -941,7 +941,7 @@ /obj/item/food/monstermeat/lizardmeat, /obj/item/food/monstermeat/lizardmeat, /obj/item/stack/sheet/animalhide/lizard, -/obj/effect/spawner/lootdrop/lizardboots, +/obj/effect/spawner/random/lizardboots, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/awaymission/bmp_ship/gate) diff --git a/_maps/map_files220/RandomZLevels/blackmesa.dmm b/_maps/map_files220/RandomZLevels/blackmesa.dmm index b04864b1a0bf..af1b9e7c29c7 100644 --- a/_maps/map_files220/RandomZLevels/blackmesa.dmm +++ b/_maps/map_files220/RandomZLevels/blackmesa.dmm @@ -14280,7 +14280,7 @@ /turf/simulated/floor/plasteel, /area/awaymission/black_mesa/entrance_large_office) "rvi" = ( -/obj/machinery/r_n_d/destructive_analyzer, +/obj/machinery/r_n_d/scientific_analyzer, /turf/simulated/floor/plasteel/dark{ icon_state = "dark" }, diff --git a/_maps/map_files220/RandomZLevels/caves.dmm b/_maps/map_files220/RandomZLevels/caves.dmm index ae6dd9fd983c..bc7dbb355aee 100644 --- a/_maps/map_files220/RandomZLevels/caves.dmm +++ b/_maps/map_files220/RandomZLevels/caves.dmm @@ -843,10 +843,6 @@ /area/awaymission/caves/build/reqpower_build) "dS" = ( /obj/structure/table/wood, -/obj/item/book/manual/wiki/experimentor{ - pixel_x = 5; - pixel_y = 8 - }, /obj/item/flashlight/lamp, /obj/effect/turf_decal/siding/wood/neutral, /obj/effect/spawner/random/dirt/often, diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 5cb3995ca384..7d4ef101a522 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -22395,7 +22395,7 @@ /turf/simulated/floor/indestructible/grass/no_creep, /area/centcom/ss220/general) "nox" = ( -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /obj/machinery/computer/crew/advanced, /turf/simulated/floor/carpet, /area/centcom/ss220/admin3) diff --git a/_maps/map_files220/stations/boxstation.dmm b/_maps/map_files220/stations/boxstation.dmm index e25ce7c36150..8140dfb7eaf4 100644 --- a/_maps/map_files220/stations/boxstation.dmm +++ b/_maps/map_files220/stations/boxstation.dmm @@ -1900,7 +1900,7 @@ }, /area/station/security/brig) "akF" = ( -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel, /area/station/security/main) "akG" = ( @@ -3172,7 +3172,7 @@ /turf/simulated/floor/plasteel, /area/station/security/processing) "apc" = ( -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /obj/machinery/recharge_station, /turf/simulated/floor/plasteel, /area/station/security/processing) @@ -4270,7 +4270,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "atx" = ( -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ dir = 8; @@ -7887,7 +7887,7 @@ /area/station/maintenance/fore) "aFt" = ( /obj/machinery/disposal, -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -8289,7 +8289,7 @@ /obj/item/storage/box/bodybags, /obj/item/restraints/handcuffs, /obj/item/flash, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "darkblue" @@ -9040,6 +9040,15 @@ /obj/structure/filingcabinet/chestdrawer, /turf/simulated/floor/wood/oak, /area/station/security/detective) +"aJp" = ( +/obj/machinery/newscaster/directional/west, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "aJq" = ( /obj/structure/morgue{ dir = 8 @@ -13207,7 +13216,7 @@ pixel_y = -22; dir = 1 }, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 }, @@ -18128,6 +18137,26 @@ /obj/structure/table/wood, /turf/simulated/floor/wood/oak, /area/station/service/library) +"bto" = ( +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/hallway) "btp" = ( /turf/simulated/floor/plasteel{ icon_state = "rampbottom" @@ -19036,7 +19065,7 @@ }, /area/station/science/rnd) "bxY" = ( -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/machinery/light/directional/south, /turf/simulated/floor/plasteel{ icon_state = "blue" @@ -21734,7 +21763,7 @@ /obj/machinery/conveyor_switch/oneway{ id = "packageExternal" }, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel, /area/station/supply/sorting) "bKF" = ( @@ -27389,14 +27418,6 @@ icon_state = "caution" }, /area/station/public/fitness) -"ckg" = ( -/obj/machinery/alarm/directional/north, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/mob/living/simple_animal/pet/dog/pug/frank, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "ckk" = ( /obj/docking_port/stationary{ dir = 8; @@ -27774,9 +27795,6 @@ icon_state = "darkpurple" }, /area/station/command/office/rd) -"clp" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) "clq" = ( /obj/machinery/computer/mecha{ dir = 4 @@ -28504,8 +28522,8 @@ }, /area/station/medical/surgery/secondary) "cod" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab) +/turf/simulated/wall, +/area/station/science/break_room) "coe" = ( /obj/structure/table/glass, /obj/item/storage/box/masks{ @@ -28855,8 +28873,26 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "cpR" = ( -/turf/simulated/wall, -/area/station/science/explab) +/obj/machinery/door/airlock/research, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/any/science/research, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/break_room) "cpS" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -29255,10 +29291,24 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/mixing) "crL" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "crM" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -29415,11 +29465,12 @@ /turf/simulated/floor/plating/airless, /area/space/nearstation) "csv" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/structure/table, +/obj/item/ashtray/glass, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "csw" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command{ @@ -29712,7 +29763,7 @@ "ctu" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, -/area/station/science/explab) +/area/station/science/break_room) "cty" = ( /obj/machinery/optable, /turf/simulated/floor/plasteel{ @@ -31555,8 +31606,8 @@ }, /area/station/medical/medbay2) "cAD" = ( -/obj/machinery/newscaster/directional/south, /obj/structure/closet/secure_closet/geneticist, +/obj/machinery/newscaster/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkpurple" }, @@ -31780,6 +31831,7 @@ "cBB" = ( /obj/machinery/door/firedoor, /obj/structure/sign/poster/official/random/west, +/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -31889,13 +31941,13 @@ /turf/simulated/wall/r_wall, /area/station/science/xenobiology) "cBS" = ( -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/plating, -/area/station/science/explab) +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "cBU" = ( /obj/structure/table, /obj/item/flashlight/lamp, @@ -32070,37 +32122,45 @@ }, /area/station/medical/medbay2) "cCT" = ( -/obj/structure/closet/l3closet/scientist, +/obj/structure/chair/sofa/corp, +/obj/machinery/light{ + dir = 1 + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cCU" = ( -/obj/structure/closet/radiation, +/obj/structure/chair/sofa/corp, +/obj/machinery/camera{ + c_tag = "Research Break Room"; + dir = 6; + network = list("SS13","RD") + }, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cCV" = ( -/obj/structure/closet/firecloset, +/obj/item/kirbyplants, +/obj/machinery/light_switch{ + pixel_y = 24; + name = "north bump" + }, /turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cCW" = ( /turf/simulated/wall, /area/station/medical/surgery/primary) "cCX" = ( -/obj/structure/closet/emcloset, -/obj/machinery/status_display/directional/north, +/obj/structure/chair/sofa/corp/left, +/obj/machinery/firealarm/directional/north, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cDa" = ( /turf/simulated/floor/plasteel{ icon_state = "floorgrime" @@ -32495,30 +32555,35 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "cEk" = ( -/obj/structure/table, -/obj/item/clipboard{ - pixel_x = 6; - pixel_y = 4 - }, -/obj/item/paper_bin{ - pixel_x = -6 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/obj/item/pen{ - pixel_x = -6 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/obj/machinery/light/directional/west, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cEn" = ( -/obj/machinery/requests_console/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cEp" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -32539,7 +32604,18 @@ }, /area/station/engineering/break_room) "cEs" = ( -/obj/machinery/light/directional/west, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurplecorner" @@ -33014,29 +33090,16 @@ }, /area/station/medical/storage) "cGz" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/corner{ - dir = 8 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cGB" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, /obj/effect/landmark/start/scientist, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cGD" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/maintenance, @@ -33202,25 +33265,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft) -"cHn" = ( -/obj/structure/table, -/obj/item/folder{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/radio/alternative{ - pixel_x = 8; - pixel_y = 14 - }, -/obj/item/folder{ - pixel_x = -6; - pixel_y = 2 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/explab) "cHo" = ( /obj/structure/cable{ icon_state = "2-8" @@ -33279,35 +33323,21 @@ }, /area/station/science/misc_lab) "cHz" = ( -/obj/machinery/power/apc/directional/south, -/obj/structure/cable, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, +/obj/structure/closet/secure_closet/scientist, +/obj/machinery/light, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cHA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/closet/secure_closet/scientist, +/obj/machinery/status_display{ + pixel_y = -32 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cHC" = ( /obj/machinery/computer/arcade, /turf/simulated/floor/plasteel, @@ -33747,37 +33777,16 @@ icon_state = "white" }, /area/station/science/robotics) -"cIN" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Biohazard"; - name = "Biohazard Shutter" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/research, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint2) "cIO" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/door_control/shutter/south{ - id = "telescienceblast"; - name = "Test Chamber Blast Doors" - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/economy/vending/scidrobe, +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cIS" = ( /obj/structure/chair/office/dark{ dir = 1 @@ -41706,6 +41715,7 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 }, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -42185,7 +42195,7 @@ dir = 1 }, /obj/structure/table/wood, -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/item/taperecorder, /obj/item/lighter/zippo/nt_rep, /turf/simulated/floor/carpet/royalblack, @@ -42606,11 +42616,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, -/obj/machinery/newscaster/security_unit{ - name = "AI newscaster"; - pixel_x = -32; - pixel_y = -32 - }, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -43874,11 +43879,6 @@ }, /turf/simulated/floor/plating, /area/station/engineering/smes) -"dHF" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/light_switch/south, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "dHU" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/blood/maybe, @@ -45442,6 +45442,11 @@ icon_state = "dark" }, /area/station/medical/morgue) +"elS" = ( +/obj/structure/table, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "ema" = ( /obj/effect/turf_decal/delivery/hollow, /obj/effect/turf_decal/stripes/line, @@ -49323,9 +49328,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "fKW" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, /obj/structure/cable{ icon_state = "1-4" }, @@ -49338,6 +49340,9 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, /turf/simulated/floor/plasteel{ icon_state = "white" }, @@ -49455,7 +49460,7 @@ }, /area/station/maintenance/fsmaint) "fNQ" = ( -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "darkred" @@ -51577,24 +51582,6 @@ icon_state = "yellow" }, /area/station/engineering/atmos) -"gDp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/obj/effect/turf_decal/stripes, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "gDH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -53135,12 +53122,6 @@ icon_state = "darkbluecorners" }, /area/station/medical/surgery/observation) -"hcE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "hcZ" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -58148,12 +58129,9 @@ }, /area/station/medical/virology) "jcc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light/directional/south, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/mob/living/simple_animal/cockroach, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "jcg" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/wood/oak, @@ -60411,7 +60389,7 @@ "jVf" = ( /obj/vehicle/secway, /obj/item/key/security, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /obj/structure/cable{ icon_state = "4-8" }, @@ -61564,21 +61542,12 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/central/south) "ktw" = ( -/obj/item/radio/intercom/directional/south, -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Lab"; - dir = 1; - network = list("Research","SS13") - }, -/obj/structure/table, -/obj/item/hand_labeler{ - pixel_y = 8 - }, -/obj/item/stack/package_wrap, +/obj/structure/cable, +/obj/machinery/power/apc/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "ktF" = ( /obj/item/radio/intercom/custom{ pixel_y = 22 @@ -62783,7 +62752,7 @@ "kQs" = ( /obj/structure/dresser, /obj/machinery/light_switch/west, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /obj/item/toy/figure/crew/hop{ layer = 4; pixel_x = -4; @@ -63912,9 +63881,11 @@ /turf/simulated/floor/wood/fancy/cherry, /area/station/service/theatre) "lor" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/economy/vending/snack, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "loP" = ( /obj/machinery/computer/med_data, /turf/simulated/floor/plasteel{ @@ -64602,10 +64573,6 @@ icon_state = "grimy" }, /area/station/security/detective) -"lBQ" = ( -/obj/item/radio/intercom/directional/north, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "lBS" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -65561,7 +65528,6 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "lTr" = ( -/obj/machinery/r_n_d/destructive_analyzer, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -66733,7 +66699,7 @@ /obj/machinery/camera{ c_tag = "Brig Head of Security's Bedroom" }, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /obj/machinery/door_control/shutter/west{ id = "hos_secure_doors" }, @@ -67544,27 +67510,13 @@ /turf/simulated/floor/carpet, /area/station/maintenance/fsmaint) "mDx" = ( -/obj/structure/table, -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the E.X.P.E.R.I-MENTOR chamber."; - layer = 4; - name = "E.X.P.E.R.I-MENTOR Camera Screen"; - network = list("Telepad"); - pixel_x = -32 - }, -/obj/item/book/manual/wiki/sop_science{ - pixel_x = -6; - pixel_y = 2 - }, -/obj/item/book/manual/wiki/experimentor{ - pixel_x = 6; - pixel_y = 2 +/obj/structure/chair/stool{ + dir = 4 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "mDE" = ( /obj/structure/cable{ icon_state = "2-8" @@ -68141,6 +68093,13 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"mSt" = ( +/obj/structure/table, +/obj/machinery/recharger, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "mSI" = ( /obj/structure/chair/comfy/brown, /obj/effect/decal/cleanable/dust, @@ -69671,11 +69630,19 @@ }, /area/station/engineering/atmos) "nuW" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/chair/stool{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "nvm" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -71549,27 +71516,6 @@ /obj/structure/bookcase, /turf/simulated/floor/wood/oak, /area/station/security/permabrig) -"ogg" = ( -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/access/any/science/research, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "ogr" = ( /obj/structure/table, /obj/item/storage/belt/medical, @@ -71985,6 +71931,11 @@ /obj/effect/spawner/random/cobweb/right/rare, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"ome" = ( +/obj/structure/barricade/wooden, +/obj/structure/grille, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "omz" = ( /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) @@ -72155,16 +72106,11 @@ /turf/simulated/floor/plasteel, /area/station/supply/qm) "oqc" = ( -/obj/machinery/disposal, -/obj/machinery/light_switch/south, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, +/obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "oqL" = ( /obj/machinery/door/airlock/external{ id_tag = "secmaint_door_int"; @@ -75915,19 +75861,11 @@ /turf/simulated/floor/plasteel, /area/station/public/dorms) "pIe" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, +/obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "pIr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -79602,22 +79540,14 @@ /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) "qXp" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/structure/extinguisher_cabinet{ + name = "east bump"; + pixel_x = 27 }, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "qXs" = ( /obj/machinery/shower{ dir = 4 @@ -80294,18 +80224,6 @@ "rlu" = ( /turf/simulated/wall/r_wall, /area/station/security/interrogation) -"rlA" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "rlG" = ( /obj/effect/landmark/start/mime, /obj/machinery/hologram/holopad, @@ -81209,16 +81127,17 @@ /area/station/engineering/utility) "rIw" = ( /obj/structure/cable{ - icon_state = "4-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "rID" = ( /obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, @@ -81356,10 +81275,6 @@ /obj/structure/chair/office/light, /turf/simulated/floor/wood/oak, /area/station/medical/psych) -"rLY" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "rMb" = ( /obj/machinery/mecha_part_fabricator, /obj/effect/mapping_helpers/turfs/burn, @@ -84093,6 +84008,10 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/maintenance/storage) +"sLB" = ( +/mob/living/simple_animal/pet/dog/pug/frank, +/turf/simulated/floor/plasteel, +/area/station/science/hallway) "sLN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -85266,6 +85185,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"thO" = ( +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall/r_wall, +/area/station/maintenance/asmaint2) "thV" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -85635,7 +85558,7 @@ }, /area/station/medical/medbay) "tpu" = ( -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, @@ -85867,14 +85790,13 @@ /turf/simulated/floor/wood/oak, /area/station/maintenance/asmaint) "tuy" = ( -/obj/structure/sign/securearea, -/obj/effect/spawner/window/reinforced/plasma/grilled, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" +/obj/structure/sign/poster/official/random{ + pixel_y = -32 }, -/turf/simulated/floor/plating, -/area/station/science/explab) +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "tuJ" = ( /obj/machinery/light/small/directional/west, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -85944,14 +85866,13 @@ /turf/simulated/floor/grass, /area/station/security/permabrig) "twv" = ( -/obj/item/kirbyplants, -/obj/machinery/firealarm/directional/west, +/obj/structure/chair/sofa/corp/right, +/obj/effect/landmark/start/scientist, /obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "twx" = ( /obj/machinery/door/window/classic/reversed{ name = "Containment Pen" @@ -86178,6 +86099,13 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/storage) +"tBK" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "tBQ" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -86323,11 +86251,14 @@ /turf/simulated/floor/plating, /area/station/command/office/hos) "tFl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/machinery/light{ + dir = 8 }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/economy/vending/coffee, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "tFr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -86728,6 +86659,11 @@ /obj/machinery/light/directional/north, /turf/simulated/floor/plasteel, /area/station/security/main) +"tOf" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small/directional/south, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "tOn" = ( /obj/machinery/suit_storage_unit/captain/secure, /obj/machinery/requests_console/directional/west, @@ -87590,7 +87526,7 @@ /turf/simulated/floor/plating, /area/station/maintenance/aft) "ubE" = ( -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /obj/structure/table/wood, /obj/item/stamp/hop{ pixel_x = 8; @@ -87958,9 +87894,6 @@ /obj/effect/spawner/wire_splicing/thirty, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) -"uij" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "uiw" = ( /obj/structure/extinguisher_cabinet/directional/east, /obj/machinery/computer/general_air_control/pt_monitor{ @@ -91413,11 +91346,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "vyu" = ( -/obj/machinery/hologram/holopad, +/obj/structure/table, +/obj/item/reagent_containers/drinks/mug/sci, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "vyw" = ( /obj/structure/chair/stool, /obj/effect/mapping_helpers/turfs/damage, @@ -92502,14 +92436,6 @@ }, /turf/simulated/floor/wood/oak, /area/station/maintenance/apmaint) -"vRJ" = ( -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Chamber"; - dir = 4; - network = list("Telepad","Research","SS13") - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "vRL" = ( /obj/item/roller{ pixel_y = 6 @@ -93249,7 +93175,7 @@ c_tag = "Blueshield's Office"; dir = 1 }, -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/machinery/computer/crew{ dir = 4 }, @@ -94128,6 +94054,11 @@ icon_state = "darkred" }, /area/station/security/brig) +"wyU" = ( +/obj/structure/grille, +/obj/structure/barricade/wooden, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "wzx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -94663,6 +94594,17 @@ /obj/machinery/light_switch/south, /turf/simulated/floor/plating, /area/station/maintenance/maintcentral) +"wJT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "wKx" = ( /obj/structure/flora/ausbushes/brflowers, /obj/structure/railing{ @@ -97392,17 +97334,10 @@ /obj/structure/disposalpipe/segment/corner{ dir = 8 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 + icon_state = "1-2" }, /turf/simulated/floor/plasteel{ icon_state = "white" @@ -98880,16 +98815,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"yjV" = ( -/obj/machinery/power/apc/directional/south, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "yko" = ( /obj/effect/turf_decal/loading_area, /turf/simulated/floor/plasteel{ @@ -142880,11 +142805,11 @@ uIf cuQ cuQ uIf +uIf +ome cuQ -cuQ -cuQ -cuQ -cuQ +wyU +qZN keZ cuQ cuQ @@ -143135,13 +143060,13 @@ ufu dlD cuQ aaa -aab -aaa -aab -aaa -aab aaa cuQ +elS +bGG +cJQ +jxu +thO bGG cJQ lqd @@ -143392,14 +143317,14 @@ hDf bWg bWg aab -clp -clp -clp -clp -clp aab cuQ bGG +xWm +dlD +bGG +wyU +bGG cJQ cuQ pUR @@ -143648,14 +143573,14 @@ kBH gsS vEr bWg -aaa -clp -lBQ -vRJ -dHF -clp -aaa +aab +aab cuQ +cEE +dlD +dlD +cJQ +qZN xWm cEE cQx @@ -143905,15 +143830,15 @@ ufl tPW lNE bWg -aab -clp -hcE -rLY -jcc -clp -aab +aaa +aaa cuQ bGG +jcc +bGG +tOf +thO +bGG cLc cuQ bcb @@ -144161,14 +144086,14 @@ cxU uqy kpz bIA -bWg -aaa -clp -ckg -uij -yjV -clp -aaa +cod +cod +cod +cod +cod +cod +bGG +bGG cuQ bGG cLc @@ -144418,14 +144343,14 @@ bWg nlT bWg bWg -bWg -aab -clp +cod +tBK +aJp tFl lor -rlA -clp -aab +cod +cLc +bGG cuQ bGG cJQ @@ -144675,14 +144600,14 @@ xdY oes lDi uPA -bWg -cpR cod +mSt +wJT cBS tuy -gDp cod -cuQ +cod +wyU cuQ cjA cuQ @@ -144932,13 +144857,13 @@ tFt cxW dRi ind -bWg +cod twv cEk mDx cGz cIO -cpR +cod vSH bGG bGG @@ -145189,13 +145114,13 @@ bXN cyC cAi cDv -bWg +cod cCU -crL +cEk csv cGB cHA -cIN +cod bGG bGG cMS @@ -145446,13 +145371,13 @@ vZD cyB kew cAD -bWg +cod cCT -crL +cEk vyu pIe cHz -cpR +cod hNT cKy bGG @@ -145703,13 +145628,13 @@ snj cAG lbd weV -bWg +cod cCX crL nuW rIw ktw -cpR +cod bGG bGG bGG @@ -145960,13 +145885,13 @@ bXN cmB rtA bXN -bWg +cod cCV cEn -cHn +cGz qXp oqc -cpR +cod pml cNt cKs @@ -146217,13 +146142,13 @@ cyI nrC ctI cCf -rKV -cpR -cpR -ctu -ogg +cod ctu cpR +ctu +cod +cod +cod rKV rKV rKV @@ -146478,7 +146403,7 @@ cBB cbq cEs cbq -lvJ +ctI wsm cLa gVu @@ -146733,7 +146658,7 @@ aeJ aeJ cDC aeJ -aeJ +bto fKW xKi onv @@ -148526,7 +148451,7 @@ awK spl rKV qkz -nOo +sLB czc jCu cAP diff --git a/_maps/map_files220/stations/deltastation.dmm b/_maps/map_files220/stations/deltastation.dmm index e5232c1c1043..92523ad447d4 100644 --- a/_maps/map_files220/stations/deltastation.dmm +++ b/_maps/map_files220/stations/deltastation.dmm @@ -1108,9 +1108,8 @@ /turf/simulated/wall/r_wall, /area/station/maintenance/apmaint) "aiQ" = ( -/obj/machinery/firealarm/directional/south, /turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/area/station/maintenance/apmaint) "aiR" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -3804,7 +3803,7 @@ /area/station/hallway/secondary/entry) "atG" = ( /obj/structure/closet/wardrobe/red, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "red" @@ -13834,12 +13833,6 @@ icon_state = "greenblue" }, /area/station/service/hydroponics) -"bjk" = ( -/obj/machinery/light_switch/south, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "bjl" = ( /obj/effect/turf_decal/delivery, /obj/structure/table/reinforced, @@ -18335,11 +18328,6 @@ pixel_y = 5; pixel_x = -28 }, -/obj/machinery/newscaster/security_unit{ - name = "west bump"; - pixel_x = -32; - pixel_y = 32 - }, /obj/item/radio/intercom/directional/north, /turf/simulated/floor/plasteel{ icon_state = "dark_large" @@ -20435,7 +20423,7 @@ /turf/simulated/floor/wood/oak, /area/station/command/meeting_room) "bJe" = ( -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/effect/turf_decal/siding/wood/oak{ dir = 6 }, @@ -20837,14 +20825,6 @@ icon_state = "yellow" }, /area/station/engineering/hallway) -"bKn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" - }, -/area/station/science/explab) "bKp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -22262,7 +22242,7 @@ /obj/structure/bed/dogbed{ name = "fox box" }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /mob/living/simple_animal/pet/dog/fox/renault, /turf/simulated/floor/plasteel/dark, /area/station/command/office/captain) @@ -23095,14 +23075,6 @@ icon_state = "dark" }, /area/station/medical/morgue) -"bRk" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/apmaint) "bRm" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/visible/yellow{ @@ -25534,7 +25506,7 @@ /area/station/command/office/captain/bedroom) "cat" = ( /obj/item/kirbyplants, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet/black, /area/station/command/office/captain/bedroom) "cax" = ( @@ -28838,6 +28810,12 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) +"cnw" = ( +/obj/machinery/newscaster/security_unit/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "dark_large" + }, +/area/station/turret_protected/ai) "cnx" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -37386,7 +37364,6 @@ /area/station/science/research) "cYm" = ( /obj/machinery/alarm/directional/west, -/obj/machinery/r_n_d/destructive_analyzer, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "vault" @@ -38326,8 +38303,9 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/port) "ddi" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab) +/obj/structure/barricade/wooden, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "ddj" = ( /obj/machinery/light/directional/south, /obj/effect/turf_decal/stripes/line{ @@ -40902,12 +40880,6 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/engine, /area/station/science/misc_lab) -"dqe" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "dqf" = ( /obj/machinery/chem_dispenser, /obj/structure/reagent_dispensers/fueltank/chem/east, @@ -42031,7 +42003,7 @@ pixel_x = -6; pixel_y = 3 }, -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /obj/machinery/light/directional/south, /obj/structure/cable{ icon_state = "1-8" @@ -42548,13 +42520,6 @@ }, /turf/simulated/floor/plating, /area/station/engineering/equipmentstorage) -"dxs" = ( -/obj/machinery/camera{ - c_tag = "Experimention Lab"; - network = list("Experimentator","Research","SS13") - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "dxv" = ( /obj/machinery/atmospherics/portable/pump, /obj/machinery/alarm/directional/east, @@ -43683,9 +43648,6 @@ }, /turf/simulated/floor/plating/airless, /area/space/nearstation) -"dEC" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "dEE" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -45178,7 +45140,7 @@ /area/station/hallway/secondary/exit) "dNR" = ( /obj/machinery/computer/crew, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "dNS" = ( @@ -46114,12 +46076,12 @@ /turf/simulated/floor/wood/oak, /area/station/service/bar/atrium) "dRT" = ( -/obj/machinery/power/apc/directional/north, /obj/structure/cable{ icon_state = "0-2" }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/effect/decal/cleanable/cobweb2, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "dRZ" = ( /obj/item/clothing/suit/fire/firefighter, /obj/structure/cable{ @@ -47907,18 +47869,14 @@ }, /area/station/maintenance/starboard2) "eas" = ( -/obj/structure/closet/bombcloset, /obj/structure/sign/poster/official/random/east, -/obj/machinery/camera{ - c_tag = "Experimentation Lab Office"; - dir = 9; - network = list("Research","SS13") - }, +/obj/structure/closet/crate, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "whitepurple" }, -/area/station/science/explab) +/area/station/maintenance/apmaint) "eau" = ( /obj/machinery/door/window/reinforced/normal{ name = "Creature Pen" @@ -48479,16 +48437,6 @@ }, /turf/simulated/floor/wood/oak, /area/station/command/office/hop) -"eiA" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 4 - }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/station/science/explab) "eiF" = ( /obj/machinery/alarm/directional/south, /obj/structure/closet/secure_closet/chaplain, @@ -52307,6 +52255,11 @@ icon_state = "hydrofloor" }, /area/station/public/toilet) +"fte" = ( +/obj/effect/spawner/random/storage, +/obj/effect/spawner/random/trash, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "ftl" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 @@ -53521,11 +53474,17 @@ }, /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/any/science/research, -/obj/machinery/door/airlock/research, +/obj/machinery/door/airlock/maintenance{ + name = "Robotics Maintenance" + }, +/obj/machinery/door/poddoor/preopen{ + id_tag = "Biohazard_RnD"; + name = "Biohazard Shutter" + }, /turf/simulated/floor/plasteel{ icon_state = "whitepurplefull" }, -/area/station/science/explab) +/area/station/maintenance/apmaint) "fPh" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dust, @@ -53997,10 +53956,6 @@ /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/port) -"fVi" = ( -/obj/effect/mapping_helpers/turfs/rust/maybe, -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) "fVI" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -55641,14 +55596,6 @@ icon_state = "whitepurple" }, /area/station/science/genetics) -"gxJ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" - }, -/area/station/science/explab) "gxV" = ( /obj/item/kirbyplants, /obj/structure/sign/poster/official/random/north, @@ -58951,16 +58898,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/wood/parquet, /area/station/service/library) -"hDa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "hDf" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/delivery, @@ -59016,11 +58953,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/directional/east, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" - }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "hDZ" = ( /obj/docking_port/stationary{ dir = 8; @@ -60966,22 +60900,11 @@ }, /area/station/service/bar/atrium) "iix" = ( -/obj/machinery/computer/security/telescreen{ - desc = "Used for watching the E.X.P.E.R.I-MENTOR chamber."; - layer = 4; - name = "E.X.P.E.R.I-MENTOR Camera Screen"; - network = list("Experimentator"); - pixel_y = 32 - }, /obj/structure/table/reinforced, /obj/item/storage/toolbox/mechanical, /obj/item/wrench, -/obj/item/weldingtool/research, -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" - }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "iiH" = ( /obj/structure/closet/secure_closet/evidence, /obj/item/id_skin/donut, @@ -61422,7 +61345,6 @@ /turf/simulated/floor/plating, /area/station/service/barber) "ipF" = ( -/obj/machinery/firealarm/directional/north, /obj/structure/disposalpipe/trunk{ dir = 8 }, @@ -61434,7 +61356,7 @@ dir = 5; icon_state = "whitepurple" }, -/area/station/science/explab) +/area/station/maintenance/apmaint) "ipM" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -62129,7 +62051,6 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/white, /area/station/science/research) "iAW" = ( @@ -62285,14 +62206,6 @@ }, /turf/simulated/floor/plating, /area/station/security/lobby) -"iDw" = ( -/obj/machinery/alarm/directional/east, -/obj/item/kirbyplants, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/explab) "iDP" = ( /obj/structure/table/reinforced, /obj/item/wrench, @@ -63810,16 +63723,6 @@ icon_state = "darkred" }, /area/station/security/storage) -"jdn" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/cobweb2, -/obj/effect/spawner/random/trash, -/obj/effect/spawner/random/storage, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "neutral" - }, -/area/station/maintenance/apmaint) "jdC" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -64266,25 +64169,6 @@ /obj/structure/table_frame, /turf/simulated/floor/plating, /area/station/maintenance/dormitory_maintenance) -"jiV" = ( -/obj/machinery/door_control/shutter/north{ - id = "experimentor"; - name = "Experimentor Control" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "jja" = ( /obj/structure/disposalpipe/junction{ dir = 1 @@ -66372,7 +66256,7 @@ /turf/simulated/wall, /area/station/turret_protected/ai_upload) "jOB" = ( -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 4 }, @@ -69377,23 +69261,11 @@ /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) "kME" = ( -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" }, -/area/station/science/explab) +/area/station/maintenance/apmaint) "kMH" = ( /obj/structure/cable{ icon_state = "1-2" @@ -70780,21 +70652,6 @@ icon_state = "white" }, /area/station/medical/virology/lab) -"lke" = ( -/obj/structure/chair/office/light{ - dir = 8; - pixel_y = 3 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/landmark/start/scientist, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "lkf" = ( /turf/simulated/floor/plasteel{ dir = 6; @@ -71618,7 +71475,7 @@ }, /obj/machinery/hologram/holopad, /obj/effect/turf_decal/delivery/hollow, -/obj/structure/disposalpipe/junction{ +/obj/structure/disposalpipe/segment{ dir = 4 }, /turf/simulated/floor/plasteel{ @@ -71701,18 +71558,11 @@ /obj/item/book/manual/wiki/sop_science{ pixel_x = 5 }, -/obj/item/book/manual/wiki/experimentor{ - pixel_x = 5; - pixel_y = 5 - }, /obj/item/clipboard{ pixel_x = -7 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "lyJ" = ( /obj/machinery/door/window/brigdoor{ dir = 1; @@ -71898,24 +71748,6 @@ /obj/effect/turf_decal/siding/wood/oak, /turf/simulated/floor/wood/oak, /area/station/service/cafeteria) -"lBi" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "lBj" = ( /obj/structure/closet/firecloset, /obj/effect/decal/cleanable/dirt, @@ -74848,16 +74680,6 @@ "myi" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/science/research, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Biohazard_RnD"; - name = "Biohazard Shutter" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) "myP" = ( @@ -75169,14 +74991,6 @@ }, /turf/simulated/floor/wood/oak, /area/station/service/bar/atrium) -"mEm" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "mEz" = ( /obj/structure/disposalpipe/segment/corner{ dir = 2 @@ -75948,10 +75762,6 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) -"mSQ" = ( -/obj/machinery/alarm/directional/north, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "mSU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 9 @@ -77411,22 +77221,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/old_kitchen) "noW" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "experimentor"; - name = "Experimentor Blast Door" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, +/obj/structure/grille/broken, /turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/area/station/maintenance/apmaint) "nph" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -79314,8 +79111,9 @@ "nOH" = ( /obj/item/relic, /obj/machinery/light/directional/west, +/obj/effect/decal/cleanable/dirt, /turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/area/station/maintenance/apmaint) "nOL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -79917,15 +79715,9 @@ }, /area/station/medical/reception) "nXl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, /obj/structure/cable{ icon_state = "1-4" }, -/obj/structure/cable{ - icon_state = "2-4" - }, /turf/simulated/floor/plasteel/white, /area/station/science/research) "nXm" = ( @@ -81608,13 +81400,9 @@ }, /area/station/medical/chemistry) "oyR" = ( -/obj/structure/cable, -/obj/machinery/power/apc/directional/south, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitepurple" - }, -/area/station/science/explab) +/obj/item/mounted/frame/apc_frame, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "ozg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -82229,14 +82017,12 @@ /turf/simulated/wall, /area/station/maintenance/apmaint) "oKa" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, /obj/structure/cable{ icon_state = "1-2" }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "oKf" = ( /obj/structure/window/reinforced, /obj/machinery/atmospherics/portable/canister/sleeping_agent{ @@ -84569,7 +84355,7 @@ }, /area/station/service/kitchen) "ptq" = ( -/obj/machinery/newscaster/security_unit/south, +/obj/machinery/newscaster/security_unit/directional/south, /turf/simulated/floor/plasteel{ icon_state = "darkneutral" }, @@ -88596,7 +88382,7 @@ /obj/item/bedsheet/hop{ dir = 1 }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/hop) "qHY" = ( @@ -91290,7 +91076,7 @@ /area/station/maintenance/starboard) "rxb" = ( /obj/machinery/computer/secure_data, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/carpet/royalblack, /area/station/command/office/ntrep) "rxe" = ( @@ -91365,8 +91151,11 @@ }, /area/station/medical/morgue) "ryd" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) +/obj/effect/decal/cleanable/dirt, +/obj/structure/grille, +/obj/structure/barricade/wooden, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "ryh" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -91481,13 +91270,9 @@ /area/station/command/office/hop) "rzO" = ( /obj/structure/closet/l3closet/scientist, -/obj/item/radio/intercom/directional/east, /obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "rAg" = ( /obj/machinery/hologram/holopad, /obj/structure/disposalpipe/segment{ @@ -92045,10 +91830,6 @@ }, /turf/simulated/floor/carpet/black, /area/station/command/office/hos) -"rLK" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "rLW" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -93636,13 +93417,6 @@ /obj/effect/decal/cleanable/dust, /turf/simulated/floor/wood/oak, /area/station/maintenance/old_kitchen) -"slk" = ( -/obj/machinery/hologram/holopad, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" - }, -/area/station/science/explab) "sls" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk{ @@ -94857,12 +94631,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plating, /area/station/security/permabrig) -"sBE" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "sBG" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/normal{ @@ -95381,15 +95149,16 @@ }, /area/station/science/xenobiology) "sJI" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, /obj/structure/cable{ - icon_state = "1-4" + icon_state = "4-8" }, -/obj/structure/disposalpipe/segment{ +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, /turf/simulated/floor/plating, @@ -95493,7 +95262,7 @@ name = "Experimentor Blast Door" }, /turf/simulated/floor/plating, -/area/station/science/explab) +/area/station/maintenance/apmaint) "sLI" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -98858,19 +98627,6 @@ icon_state = "chapel" }, /area/station/service/chapel) -"tSt" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "tSM" = ( /obj/machinery/sparker{ id = "testigniter"; @@ -99658,13 +99414,12 @@ /obj/structure/cable{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 }, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel/white, /area/station/science/research) "ueI" = ( @@ -99833,18 +99588,6 @@ icon_state = "brown" }, /area/station/supply/qm) -"uic" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "uid" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -103404,10 +103147,6 @@ icon_state = "whitegreencorner" }, /area/station/medical/virology/lab) -"vpS" = ( -/obj/effect/landmark/spawner/rev, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "vpT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/effect/turf_decal/stripes/line{ @@ -103606,6 +103345,10 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/storage) +"vtk" = ( +/mob/living/simple_animal/pet/dog/pug/frank, +/turf/simulated/floor/plasteel/white, +/area/station/science/break_room) "vtq" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, @@ -104947,14 +104690,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel/white, /area/station/science/research) -"vTf" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/mob/living/simple_animal/pet/dog/pug/frank, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "vTi" = ( /obj/structure/table/reinforced, /obj/item/storage/box/monkeycubes{ @@ -106453,6 +106188,11 @@ }, /turf/simulated/floor/plasteel/white, /area/station/service/kitchen) +"wsU" = ( +/obj/structure/grille, +/obj/structure/barricade/wooden, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "wtd" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -107286,7 +107026,7 @@ }, /area/station/hallway/primary/central/ne) "wGL" = ( -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel/dark, /area/station/command/bridge) "wHc" = ( @@ -107622,13 +107362,7 @@ }, /area/station/maintenance/starboard) "wNp" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, /obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, @@ -109121,7 +108855,7 @@ /obj/structure/chair/office/dark{ dir = 1 }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /obj/effect/turf_decal/siding/wood/oak{ dir = 4 }, @@ -118595,7 +118329,7 @@ btd byg bBf bye -rPK +cnw btd btd bIi @@ -143824,7 +143558,7 @@ bEp pOp uMt peG -ykJ +vtk gPh ykJ pFW @@ -143852,8 +143586,8 @@ lim rfh rQj gwu -jdn -dOO +dCJ +fte iOp wCG uFe @@ -144109,12 +143843,12 @@ uUc pjk kWF gwu -fVi -ryd -ryd -ryd -ryd +iOp +wsU +dbw +dbw ryd +dbw dFX sea dJx @@ -144366,12 +144100,12 @@ uUc pjk pjk lSu -dEC -dEC +tYD +dbp nOH -dEC -dEC -ryd +aiQ +dOO +dbw dCJ hAn ssL @@ -144623,12 +144357,12 @@ uUc pjk pjk lSu -mSQ -vpS -rLK -dEC -dEC -ryd +uFe +dbp +dzb +uFe +pVG +dbw ddy nTW dOO @@ -144880,12 +144614,12 @@ nXr pjk rDQ lSu -dxs -dqe -dEC -sBE -dEC -ryd +dOO +aiQ +dbp +aiQ +dOO +dUO dGf dHL dUO @@ -145139,10 +144873,10 @@ kWF lSu dRT oKa -vTf -uic +nmA aiQ -ryd +aiQ +dbw dCU hLV lZX @@ -145399,7 +145133,7 @@ sLp sLp noW sLp -ddi +dbw nJW hLV xVf @@ -145653,10 +145387,10 @@ lSu lSu iix lyD -eiA +dOO kME oyR -ddi +dbw dCU nTW ddy @@ -145907,14 +145641,14 @@ cTr fyp lrv tDl -ddi -jiV -lke -mEm -tSt -hDa +dbw +dOO +dOO +dOO +dzb +dOO myi -bRk +dGf sJI dbp oLe @@ -146165,12 +145899,12 @@ ueF nXl wNp fOS -lBi -gxJ -slk -bKn -bjk -ddi +dOO +dOO +dOO +dOO +dzb +dbw dOO nTW ddy @@ -146421,13 +146155,13 @@ dhE rWL ngP dzU -ddi +dbw ipF -iDw +dOO eas rzO hDS -ddi +dEi dCU hLV dbp @@ -146679,12 +146413,12 @@ dqp dqp dqp dqp +dbw ddi -ddi -ddi -ddi -ddi -ddi +dbw +dEi +dbw +dbw ddy nNv ssL diff --git a/_maps/map_files220/stations/metastation.dmm b/_maps/map_files220/stations/metastation.dmm index bc46f3dfefb8..0074298542ae 100644 --- a/_maps/map_files220/stations/metastation.dmm +++ b/_maps/map_files220/stations/metastation.dmm @@ -464,7 +464,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/legal/magistrate) "afw" = ( @@ -782,22 +782,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/fore) "aiM" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 9 }, -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 }, /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "1-8" }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "aiN" = ( /obj/item/radio/intercom/directional/west, /turf/simulated/floor/plasteel{ @@ -4284,10 +4279,6 @@ /area/station/maintenance/port) "azQ" = ( /obj/item/stack/sheet/cardboard, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, /turf/simulated/floor/plating, /area/station/maintenance/port2) "azR" = ( @@ -5529,17 +5520,6 @@ icon_state = "barber" }, /area/station/public/dorms) -"aFL" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/landmark/start/scientist, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "aFM" = ( /obj/effect/spawner/random/barrier/grille_often, /obj/structure/cable/yellow{ @@ -10829,6 +10809,11 @@ icon_state = "neutralcorner" }, /area/station/public/locker) +"aYL" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/cobweb/left/frequent, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "aYM" = ( /obj/structure/cable/yellow, /obj/machinery/power/apc/directional/south, @@ -15060,23 +15045,6 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/central) -"bli" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "blk" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -15517,7 +15485,7 @@ /obj/machinery/photocopier/faxmachine/longrange{ department = "Captain's Office" }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) "bmp" = ( @@ -15773,6 +15741,11 @@ icon_state = "cautioncorner" }, /area/station/hallway/primary/starboard) +"bng" = ( +/obj/effect/decal/cleanable/dirt, +/mob/living/simple_animal/mouse, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "bnh" = ( /obj/machinery/firealarm/directional/north, /obj/machinery/light/directional/north, @@ -16474,12 +16447,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/simulated/floor/plasteel, /area/station/maintenance/starboard) -"bpm" = ( -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/station/science/explab) "bpn" = ( /turf/simulated/floor/plasteel, /area/station/engineering/break_room) @@ -17103,7 +17070,7 @@ }, /obj/item/pen/multi, /obj/machinery/light/small/directional/east, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -18819,7 +18786,7 @@ /obj/machinery/computer/security/mining{ dir = 8 }, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/wood, /area/station/command/office/hop) "bwd" = ( @@ -25139,14 +25106,6 @@ icon_state = "dark" }, /area/station/medical/morgue) -"bTb" = ( -/obj/effect/mapping_helpers/turfs/damage, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "bTc" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -25739,7 +25698,7 @@ pixel_x = -5; pixel_y = 1 }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /obj/item/lighter/zippo/nt_rep{ pixel_x = 10 }, @@ -25991,7 +25950,7 @@ pixel_y = 6 }, /obj/machinery/keycard_auth/north, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/carpet/blue, /area/station/command/office/blueshield) "bWi" = ( @@ -29211,10 +29170,12 @@ }, /area/station/command/office/rd) "cha" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/chair/stool{ + dir = 1 }, -/area/station/science/explab) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "chb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -30361,10 +30322,6 @@ /obj/machinery/atmospherics/pipe/simple/visible, /turf/simulated/wall/r_wall, /area/station/maintenance/turbine) -"clC" = ( -/obj/machinery/light/small/directional/north, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard2) "clE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -30449,7 +30406,6 @@ /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) "clS" = ( -/obj/machinery/r_n_d/destructive_analyzer, /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, @@ -30873,19 +30829,9 @@ }, /area/station/hallway/primary/central) "cnF" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/disposal, -/obj/machinery/light_switch/north{ - pixel_x = -6 - }, -/obj/machinery/light/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) +/obj/effect/spawner/random/barrier/grille_often, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "cnG" = ( /obj/machinery/firealarm/directional/west, /turf/simulated/floor/plasteel{ @@ -30914,8 +30860,11 @@ /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) "cnK" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/structure/chair/stool{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "cnL" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/old, @@ -31203,14 +31152,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/robotics/chargebay) -"coI" = ( -/obj/machinery/light/small/directional/west, -/obj/structure/mopbucket{ - dir = 4 - }, -/obj/item/mop, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard2) "coM" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil/random, @@ -31922,6 +31863,21 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"cse" = ( +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 1 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "csf" = ( /obj/machinery/atmospherics/portable/canister, /turf/simulated/floor/plating, @@ -32105,14 +32061,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/aft) -"csV" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "csW" = ( /obj/structure/rack, /obj/item/seeds/cannabis, @@ -32384,10 +32332,6 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) @@ -32529,11 +32473,9 @@ }, /area/station/science/xenobiology) "cux" = ( -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "cuy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32731,15 +32673,6 @@ icon_state = "whiteblue" }, /area/station/medical/exam_room) -"cve" = ( -/obj/structure/girder, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "cvg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32804,10 +32737,6 @@ /area/station/maintenance/aft) "cvH" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/directional/west, /turf/simulated/floor/plasteel{ icon_state = "darkgreycheck" }, @@ -33399,11 +33328,6 @@ icon_state = "grimy" }, /area/station/service/chapel/office) -"cxS" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "cxT" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -34583,14 +34507,6 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"cCr" = ( -/obj/machinery/atmospherics/unary/portables_connector, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "cCs" = ( /obj/structure/sign/kiddieplaque/remembrance{ pixel_y = 32 @@ -34950,25 +34866,6 @@ icon_state = "whitepurplefull" }, /area/station/science/robotics) -"cDN" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/command, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/rd, -/obj/effect/mapping_helpers/airlock/access/any/command/blueshield, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" - }, -/area/station/command/office/rd) "cDO" = ( /turf/simulated/floor/plasteel{ dir = 5; @@ -36776,9 +36673,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "cKu" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/item/kirbyplants/plant21, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "cKv" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -37017,10 +36914,6 @@ /area/station/hallway/secondary/exit) "cLr" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/plating, /area/station/maintenance/starboard) @@ -37044,14 +36937,10 @@ }, /area/station/security/checkpoint/south) "cLB" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) +/obj/structure/barricade/wooden, +/obj/effect/spawner/window, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "cLE" = ( /obj/structure/sign/directions/science{ pixel_x = -32; @@ -37399,13 +37288,10 @@ }, /area/station/medical/reception) "cNu" = ( -/obj/structure/table, -/obj/item/crowbar, -/obj/item/weldingtool/research, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) +/obj/structure/closet/emcloset, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "cNv" = ( /obj/machinery/power/smes, /obj/structure/cable/yellow, @@ -37895,14 +37781,6 @@ /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"cPq" = ( -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, -/obj/effect/mapping_helpers/turfs/damage, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "cPr" = ( /obj/effect/mapping_helpers/turfs/damage, /obj/structure/table, @@ -39822,6 +39700,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "cYq" = ( @@ -40093,8 +39974,7 @@ }, /area/station/service/chapel) "cZY" = ( -/obj/structure/reagent_dispensers/watertank, -/turf/simulated/floor/plating, +/turf/simulated/floor/mech_bay_recharge_floor, /area/station/maintenance/starboard2) "daa" = ( /obj/effect/decal/cleanable/dirt, @@ -40221,15 +40101,14 @@ /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) "daw" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/radio/intercom/directional/north, -/obj/machinery/firealarm/directional/west, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/area/station/science/explab) +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "day" = ( /obj/machinery/light/small/directional/east, /obj/effect/turf_decal/tile/blue{ @@ -40437,10 +40316,6 @@ /obj/structure/rack, /obj/item/extinguisher, /obj/item/storage/belt/utility, -/obj/effect/spawner/lootdrop{ - loot = list(/obj/item/storage/box/mousetraps,/obj/item/storage/box/lights/tubes,/obj/item/storage/box/lights/mixed,/obj/item/storage/box/lights/bulbs); - name = "Janitor Supplies Spawner" - }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "dcd" = ( @@ -40568,20 +40443,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "dcX" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ +/obj/machinery/door/airlock/maintenance, +/obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "dcY" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -41692,14 +41559,9 @@ }, /area/station/supply/expedition) "dru" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "drv" = ( /obj/item/kirbyplants{ level = 4.1 @@ -42261,7 +42123,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /obj/item/id_skin/donut, /turf/simulated/floor/carpet, /area/station/security/detective) @@ -42857,14 +42719,6 @@ icon_state = "red" }, /area/station/security/warden) -"dZP" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "dZZ" = ( /obj/structure/closet/emcloset, /obj/machinery/power/apc/directional/east, @@ -43931,9 +43785,10 @@ }, /area/station/security/permabrig) "eAx" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/structure/closet/firecloset, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "eAU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -44035,10 +43890,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/a) -"eDv" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "eDx" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -44419,15 +44270,6 @@ icon_state = "white" }, /area/station/science/rnd) -"eQc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "eQf" = ( /obj/structure/table/wood, /obj/structure/sign/kiddieplaque/perfect_drone{ @@ -45690,14 +45532,6 @@ icon_state = "dark" }, /area/station/security/range) -"fuy" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "fuC" = ( /obj/item/radio/intercom/directional/east, /turf/simulated/floor/plasteel{ @@ -46578,14 +46412,6 @@ icon_state = "caution" }, /area/station/engineering/atmos/distribution) -"fRh" = ( -/obj/structure/chair/office/dark{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "fRj" = ( /obj/structure/disposalpipe/segment/corner{ dir = 8 @@ -46894,6 +46720,11 @@ icon_state = "darkbrown" }, /area/station/supply/expedition) +"fZc" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/reagent_dispensers/watertank, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "fZm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -48429,10 +48260,18 @@ }, /area/station/hallway/primary/starboard) "gND" = ( -/obj/machinery/alarm/directional/north, -/obj/machinery/light/small/directional/north, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/door/airlock/maintenance, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/cyan{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "gNG" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -48588,14 +48427,6 @@ icon_state = "white" }, /area/station/science/xenobiology) -"gSO" = ( -/obj/effect/spawner/window/reinforced/grilled, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "rdrnd"; - name = "Research and Development Shutters" - }, -/turf/simulated/floor/plating, -/area/station/science/rnd) "gSU" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -50068,7 +49899,7 @@ /turf/simulated/floor/plasteel{ icon_state = "whitepurplefull" }, -/area/station/science/explab) +/area/station/maintenance/starboard2) "hBH" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on{ dir = 8; @@ -51504,8 +51335,8 @@ /turf/simulated/floor/plasteel, /area/station/supply/office) "ima" = ( -/obj/structure/reagent_dispensers/fueltank, -/turf/simulated/floor/plating, +/obj/machinery/recharge_station, +/turf/simulated/floor/plasteel, /area/station/maintenance/starboard2) "imb" = ( /obj/structure/cable/yellow{ @@ -53153,13 +52984,6 @@ /obj/structure/lattice, /turf/space, /area/space/nearstation) -"jcA" = ( -/obj/machinery/light/small/directional/north, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "jcD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -53214,14 +53038,6 @@ icon_state = "whitepurplefull" }, /area/station/science/xenobiology) -"jes" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft2) "jeY" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/yellow{ @@ -53615,6 +53431,10 @@ icon_state = "whiteblue" }, /area/station/medical/storage) +"jtO" = ( +/obj/effect/spawner/random/fungus/maybe, +/turf/simulated/wall, +/area/station/maintenance/starboard2) "juc" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -54534,10 +54354,6 @@ icon_state = "brown" }, /area/station/supply/office) -"jPj" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "jPv" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -55461,15 +55277,9 @@ }, /area/station/science/robotics) "kqi" = ( -/obj/machinery/power/apc/directional/east, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "kqw" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -55927,6 +55737,15 @@ icon_state = "red" }, /area/station/security/prison/cell_block/a) +"kCp" = ( +/obj/machinery/power/apc/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "darkgreycheck" + }, +/area/station/command/office/rd) "kCP" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -56641,7 +56460,7 @@ /area/station/legal/courtroom) "kQD" = ( /obj/machinery/computer/secure_data, -/obj/machinery/newscaster/security_unit/north, +/obj/machinery/newscaster/security_unit/directional/north, /turf/simulated/floor/plasteel{ dir = 1; icon_state = "red" @@ -57047,15 +56866,6 @@ icon_state = "whiteyellow" }, /area/station/medical/chemistry) -"laH" = ( -/obj/structure/lattice, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/space, -/area/space/nearstation) "laU" = ( /obj/item/soap, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -58463,7 +58273,6 @@ }, /area/station/science/research) "lGD" = ( -/obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -62463,11 +62272,6 @@ /area/station/service/bar) "nzz" = ( /obj/structure/girder, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) "nzE" = ( @@ -62960,6 +62764,12 @@ }, /turf/simulated/floor/engine, /area/station/engineering/control) +"nMU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "nNk" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/autoname, @@ -63152,11 +62962,8 @@ /turf/simulated/floor/plating, /area/station/public/storage/emergency) "nUa" = ( -/obj/structure/table, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/station/science/explab) +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "nUu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -63204,7 +63011,7 @@ pixel_x = 4 }, /obj/machinery/light/directional/east, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel{ dir = 4; icon_state = "red" @@ -63658,17 +63465,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"oha" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "darkgreycheck" - }, -/area/station/command/office/rd) "ohH" = ( /obj/effect/spawner/airlock/e_to_w/long, /obj/effect/spawner/window/reinforced/grilled, @@ -64549,15 +64345,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/science/robotics) -"oNn" = ( -/obj/structure/girder, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard2) "oNo" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -64841,9 +64628,9 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) "oUs" = ( -/obj/machinery/light/small/directional/south, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "oUw" = ( /obj/machinery/light/small/directional/north, /turf/simulated/floor/plating, @@ -65945,14 +65732,6 @@ icon_state = "freezerfloor" }, /area/station/public/toilet/lockerroom) -"pyU" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/asmaint) "pzC" = ( /obj/item/storage/belt/utility, /obj/effect/decal/cleanable/dirt, @@ -66260,14 +66039,6 @@ /obj/effect/spawner/random/trash, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"pHF" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/xenobio_south) "pHM" = ( /obj/structure/sign/poster/official/random/east, /obj/machinery/economy/vending/hydrodrobe, @@ -67405,13 +67176,6 @@ icon_state = "red" }, /area/station/security/checkpoint/south) -"qgw" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "qgz" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -67662,12 +67426,9 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "qnY" = ( -/obj/machinery/light/small/directional/south, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/item/kirbyplants/plant21, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "qof" = ( /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -67859,13 +67620,10 @@ }, /area/station/engineering/control) "qtr" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "qtt" = ( /obj/structure/window/reinforced{ dir = 1 @@ -68060,14 +67818,6 @@ /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/security/range) -"qxo" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "qxZ" = ( /obj/structure/cable/yellow{ icon_state = "0-2" @@ -68156,19 +67906,10 @@ }, /area/station/public/fitness) "qAH" = ( -/obj/structure/table, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_y = 6 - }, -/obj/item/reagent_containers/dropper{ - pixel_y = -5 - }, -/obj/machinery/alarm/directional/south, -/obj/machinery/light/directional/south, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) +/obj/effect/turf_decal/delivery/white/hollow, +/obj/item/mecha_parts/mecha_equipment/extinguisher, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "qAP" = ( /obj/machinery/button/windowtint/east{ id = "Surgery2"; @@ -69531,15 +69272,6 @@ icon_state = "yellow" }, /area/station/hallway/primary/aft) -"rnT" = ( -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/directional/north, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "rnY" = ( /obj/machinery/door/airlock/external{ id_tag = "admin_home"; @@ -69897,6 +69629,14 @@ }, /turf/space, /area/space/nearstation) +"rwM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "rwT" = ( /obj/effect/spawner/random/trash, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -70063,24 +69803,11 @@ /turf/simulated/floor/plasteel/dark, /area/station/service/cafeteria) "rAm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" +/obj/structure/disposalpipe/segment/corner{ + dir = 4 }, -/area/station/science/explab) +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "rAp" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan{ dir = 8; @@ -70448,6 +70175,12 @@ icon_state = "white" }, /area/station/medical/exam_room) +"rJq" = ( +/obj/structure/rack, +/obj/item/stack/cable_coil/random, +/obj/effect/spawner/random/maintenance, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "rJJ" = ( /obj/machinery/door/airlock/titanium, /obj/effect/mapping_helpers/airlock/autoname, @@ -71724,13 +71457,6 @@ }, /turf/simulated/floor/carpet, /area/station/service/library) -"svV" = ( -/obj/machinery/camera{ - c_tag = "Science - E.X.P.E.R.I-MENTOR Chamber"; - network = list("Research","SS13") - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "swg" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -71914,24 +71640,12 @@ /turf/simulated/floor/plating, /area/station/maintenance/port2) "sBZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/door/window/reinforced/reversed{ - dir = 8; - name = "Reinforced Glass Door" - }, -/obj/effect/mapping_helpers/airlock/windoor/access/any/science/research{ +/obj/structure/disposalpipe/broken{ dir = 8 }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "sCr" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/command, @@ -72212,18 +71926,6 @@ }, /turf/simulated/floor/plating, /area/station/medical/virology) -"sJj" = ( -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/spawner/window/reinforced/polarized/grilled{ - id = "RD" - }, -/turf/simulated/floor/plating, -/area/station/command/office/rd) "sJE" = ( /obj/structure/sign/biohazard, /turf/simulated/wall, @@ -72469,11 +72171,8 @@ /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) "sNJ" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/mapping_helpers/airlock/access/any/science/research, +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) "sNR" = ( @@ -72940,17 +72639,6 @@ icon_state = "yellow" }, /area/station/hallway/primary/aft) -"sZV" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "taf" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -73721,15 +73409,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) -"tsE" = ( -/obj/structure/girder, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/fpmaint) "ttb" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -74045,13 +73724,9 @@ }, /area/station/security/armory/secure) "tCr" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) +/obj/effect/turf_decal/loading_area, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "tCw" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/firecloset, @@ -74600,7 +74275,7 @@ /area/station/supply/expedition) "tSX" = ( /obj/machinery/photocopier, -/obj/machinery/newscaster/security_unit/east, +/obj/machinery/newscaster/security_unit/directional/east, /turf/simulated/floor/plasteel/dark, /area/station/command/office/hos) "tTh" = ( @@ -75624,6 +75299,10 @@ /obj/machinery/atmospherics/pipe/manifold4w/visible, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) +"uyV" = ( +/obj/structure/grille/broken, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "uzt" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -76191,14 +75870,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore) -"uNk" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating/airless, -/area/space/nearstation) "uNl" = ( /obj/structure/toilet{ pixel_y = 8 @@ -77706,14 +77377,6 @@ icon_state = "white" }, /area/station/science/xenobiology) -"vxx" = ( -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/apmaint) "vxI" = ( /obj/machinery/light/directional/north, /obj/structure/disposalpipe/segment{ @@ -78201,11 +77864,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, /turf/simulated/floor/plating, /area/station/maintenance/aft) "vPa" = ( @@ -78255,6 +77913,13 @@ icon_state = "darkneutralfull" }, /area/station/science/research) +"vQU" = ( +/obj/machinery/mech_bay_recharge_port{ + dir = 2 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "vRv" = ( /obj/structure/closet/secure_closet/freezer/fridge, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -78542,14 +78207,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) -"vZh" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "vZl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -78681,7 +78338,7 @@ c_tag = "Security - Office - Port - West"; dir = 4 }, -/obj/machinery/newscaster/security_unit/west, +/obj/machinery/newscaster/security_unit/directional/west, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "red" @@ -78724,15 +78381,6 @@ icon_state = "whitepurple" }, /area/station/science/research) -"wfa" = ( -/obj/structure/girder, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "wfi" = ( /obj/machinery/hologram/holopad, /obj/structure/cable/yellow{ @@ -78766,20 +78414,16 @@ }, /area/station/turret_protected/ai_upload) "wfE" = ( -/obj/effect/landmark/lightsout, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/hologram/holopad, -/obj/effect/landmark/start/scientist, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/item/storage/toolbox/mechanical{ + pixel_x = -3; + pixel_y = 3 }, -/area/station/science/explab) +/obj/structure/table, +/obj/item/storage/toolbox/electrical, +/obj/effect/spawner/random/maintenance, +/obj/effect/spawner/random/cobweb/right/rare, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "wgh" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -79068,13 +78712,12 @@ /turf/simulated/floor/plasteel, /area/station/supply/lobby) "wpL" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whiteblue" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 1 }, -/area/station/science/explab) +/turf/simulated/floor/plating, +/area/station/maintenance/starboard2) "wqf" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -79295,19 +78938,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry) -"wvJ" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/aft2) "wvK" = ( /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, @@ -79574,26 +79204,6 @@ icon_state = "whitebluefull" }, /area/station/medical/paramedic) -"wDg" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "wDM" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line{ @@ -81007,13 +80617,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/disposal) -"xrm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "xrx" = ( /obj/structure/table/glass, /obj/item/folder/yellow, @@ -81325,11 +80928,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/effect/spawner/lootdrop{ - icon_state = "grille"; - loot = list(/obj/structure/grille=8,/obj/structure/grille/broken=2); - name = "normal or broken grille spawner" - }, /turf/simulated/floor/plating, /area/station/maintenance/starboard) "xzB" = ( @@ -82014,11 +81612,10 @@ }, /area/station/medical/surgery/observation) "xPE" = ( -/obj/structure/table, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) +/obj/machinery/mecha_part_fabricator, +/obj/effect/spawner/random/cobweb/left/rare, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard2) "xPO" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4; @@ -93013,11 +92610,11 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq aaa aaa aaa @@ -93270,11 +92867,11 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa -laH +abq aaa aaa aaa @@ -93518,20 +93115,20 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq aaa brn aaa -laH +abq aaa aaa aaa @@ -93622,9 +93219,9 @@ aaa aaa aaa cVm -laH -laH -laH +abq +abq +abq aaa aaa aaa @@ -93775,7 +93372,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -93788,7 +93385,7 @@ aaa aaa aiQ aaa -laH +abq aaa aaa aaa @@ -94032,7 +93629,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -94045,19 +93642,19 @@ agM abq hpJ abq -laH -laH -laH -laH -laH -laH -laH -laH -aaa -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +aaa +abq +abq +abq +abq arA arA arA @@ -94289,7 +93886,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -94546,7 +94143,7 @@ aaa aaa aaa aaa -laH +abq aaa abq abq @@ -94667,22 +94264,22 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq iju aaa aaa @@ -94803,7 +94400,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -94924,7 +94521,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -95060,7 +94657,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -95181,7 +94778,7 @@ cRe aaa aaa aaa -laH +abq aaa abq aaa @@ -95317,7 +94914,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -95438,7 +95035,7 @@ aaa aaa aaa aaa -laH +abq aaa coR mHF @@ -95574,7 +95171,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -95695,7 +95292,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -95712,7 +95309,7 @@ aaa aaa abq abq -laH +abq aaa aaa aaa @@ -95831,7 +95428,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -95910,7 +95507,7 @@ uWq bBv dgb cdT -bTb +bVR bBz anE cdT @@ -95952,7 +95549,7 @@ chS aaa aaa aaa -laH +abq aaa abq aaa @@ -95969,7 +95566,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -96088,7 +95685,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -96196,15 +95793,15 @@ aef abq abq abq -laH -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +abq cIl abq abq @@ -96345,7 +95942,7 @@ aaa aaa aaa aaa -laH +abq aaa abq abq @@ -96424,7 +96021,7 @@ lvE cdT cdT cRV -dZP +bTY bBz bWm cdT @@ -96483,7 +96080,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -96602,7 +96199,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -96650,7 +96247,7 @@ cEr rbU xgb aAP -fuy +adY adY aYb aOB @@ -96740,7 +96337,7 @@ aaa aaa abq aaa -laH +abq aaa aaa aaa @@ -96859,7 +96456,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -96938,10 +96535,10 @@ eBk aoX auC bTY -dZP +bTY bVR cDH -dZP +bTY clT bTY cLN @@ -96997,7 +96594,7 @@ abq abq abq aaa -laH +abq aaa aaa aaa @@ -97116,7 +96713,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -97254,7 +96851,7 @@ ctJ aaa abq aaa -laH +abq aaa aaa aaa @@ -97453,7 +97050,7 @@ cdT cdT cdT cdT -dZP +bTY rvu cdT cKB @@ -97511,7 +97108,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -98025,7 +97622,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -98282,7 +97879,7 @@ cFj aaa abq aaa -laH +abq aaa aaa aaa @@ -98539,7 +98136,7 @@ abq abq abq aaa -laH +abq aaa aaa aaa @@ -98658,7 +98255,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -98796,7 +98393,7 @@ aaa aaa abq aaa -laH +abq aaa aaa aaa @@ -98915,7 +98512,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -99053,7 +98650,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -99172,7 +98769,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -99260,7 +98857,7 @@ bZP bZP bZP bZP -cve +bMZ bZP bZP bZP @@ -99429,7 +99026,7 @@ aaa aaa aaa aaa -laH +abq aaa abq abq @@ -99519,7 +99116,7 @@ ckQ bZP dak cQz -vxx +crG cjj cxF bZP @@ -99567,7 +99164,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -99686,7 +99283,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -99824,7 +99421,7 @@ aaa aaa abq aaa -laH +abq aaa aaa aaa @@ -99943,7 +99540,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -100081,7 +99678,7 @@ aaa aaa abq aaa -laH +abq aaa aaa aaa @@ -100200,7 +99797,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -100288,9 +99885,9 @@ crG wjL fkr bZP -vxx -vxx -vxx +crG +crG +crG clK cSg bZP @@ -100338,7 +99935,7 @@ aaa aaa abq aaa -laH +abq aaa aaa aaa @@ -100457,7 +100054,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -100485,7 +100082,7 @@ qLW aGN arE qwm -fuy +adY aHv adY jGH @@ -100595,7 +100192,7 @@ aaa aaa abq abq -laH +abq aaa aaa aaa @@ -100714,7 +100311,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -100794,10 +100391,10 @@ bRI bRH bWm cdT -dZP +bTY avU bTY -dZP +bTY naY bZP cQu @@ -100971,7 +100568,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -101228,7 +100825,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -101301,7 +100898,7 @@ aSM aSM pso aSM -sZV +aSM hUe aSM aSM @@ -101485,7 +101082,7 @@ aaa aaa aaa aaa -laH +abq aaa abq aaa @@ -101509,15 +101106,15 @@ akv ajE aky anC -fuy +adY pxf bpT -fuy +adY adY aKy aDB -fuy -tsE +adY +jJn aOB aOB aMq @@ -101554,7 +101151,7 @@ bxZ cdT bBN cms -dZP +bTY bHp bWi bTY @@ -101563,11 +101160,11 @@ bTY cms auC bTr -dZP +bTY aqB cdG -dZP -dZP +bTY +bTY piE avU bZP @@ -101736,13 +101333,13 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq aaa abq aaa @@ -101779,7 +101376,7 @@ aOB bmK bgA bmi -fuy +adY rwj aVl aLS @@ -101993,7 +101590,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -102036,8 +101633,8 @@ aOB axt atk adY -fuy -fuy +adY +adY aVl aLQ aNY @@ -102084,7 +101681,7 @@ bZW bFw cdT avU -wfa +aoX lcK bZP crG @@ -102250,7 +101847,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -102269,11 +101866,11 @@ rgu aJM pdc abW -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq iMJ ajB ajB @@ -102507,7 +102104,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -102527,7 +102124,7 @@ dpZ wRL jfk aaa -laH +abq aaa aaa aaa @@ -102764,7 +102361,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa dqt @@ -102784,7 +102381,7 @@ awA lmP gjF aaa -laH +abq aaa aaa aaa @@ -103021,7 +102618,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa hov @@ -103068,7 +102665,7 @@ abq aaa aaa aOB -fuy +adY ozf aHY aXn @@ -103112,7 +102709,7 @@ bHr mcd cdT bqQ -cPq +bVR bZP aHy crG @@ -103278,7 +102875,7 @@ aaa aaa aaa aaa -laH +abq abq abW abW @@ -103535,7 +103132,7 @@ aaa aaa aaa aaa -laH +abq aaa nui aYF @@ -103792,7 +103389,7 @@ aaa aaa aaa aaa -laH +abq aaa ieD thc @@ -103824,7 +103421,7 @@ aaa aOB aAZ xZD -fuy +adY auG aOB oUa @@ -104049,7 +103646,7 @@ aaa aaa aaa aaa -laH +abq abq abW fLK @@ -104306,7 +103903,7 @@ aaa aaa aaa aaa -laH +abq abq abW gmn @@ -104563,7 +104160,7 @@ aaa aaa aaa aaa -laH +abq aaa toO hdk @@ -104820,7 +104417,7 @@ aaa aaa aaa aaa -laH +abq aaa uMy lNt @@ -105077,7 +104674,7 @@ aaa aaa aaa aaa -laH +abq tpq abW abW @@ -106622,9 +106219,9 @@ aaa aaa aaa kQv -uNk -uNk -uNk +arA +arA +arA kbN kbN kbN @@ -111253,7 +110850,7 @@ aaa aaa aaa aaa -laH +abq aaa lZU rsQ @@ -111510,7 +111107,7 @@ aaa aaa aaa aaa -laH +abq aaa hnc xjC @@ -111767,7 +111364,7 @@ aaa aaa aaa aaa -laH +abq aaa apO aSm @@ -112024,7 +111621,7 @@ aaa aaa aaa aaa -laH +abq aaa apO eXK @@ -112281,7 +111878,7 @@ aaa aaa aaa aaa -laH +abq aaa apO eXK @@ -112538,7 +112135,7 @@ aaa aaa aaa aaa -laH +abq aaa apO eXK @@ -112795,7 +112392,7 @@ aaa aaa aaa aaa -laH +abq aaa apO eXK @@ -113052,7 +112649,7 @@ aaa aaa aaa aaa -laH +abq aaa apO aSm @@ -113309,7 +112906,7 @@ aaa aaa aaa aaa -laH +abq aaa apO aFe @@ -113566,7 +113163,7 @@ aaa aaa aaa aaa -laH +abq aaa sRw tcD @@ -113823,7 +113420,7 @@ aaa aaa aaa aaa -laH +abq aaa apO fJr @@ -114080,7 +113677,7 @@ aaa aaa aaa aaa -laH +abq abq apO tNe @@ -114339,7 +113936,7 @@ aaa aaa aaa aaa -laH +abq tNe yfj tnT @@ -114596,7 +114193,7 @@ aaa aaa aaa aaa -laH +abq tNe erL jIN @@ -114853,7 +114450,7 @@ aaa aaa aaa aaa -laH +abq tNe tNe tNe @@ -115110,7 +114707,7 @@ aaa aaa aaa aaa -laH +abq abq abq abq @@ -115369,7 +114966,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -115455,11 +115052,11 @@ cip cte lOv cmB -cvl +cmB hBB -gSO -gSO -gSO +cmB +cmB +cmB cvl mVl afT @@ -115479,7 +115076,7 @@ aoN euy mVD coG -jes +vZo coG cQd cQd @@ -115626,7 +115223,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -115710,8 +115307,8 @@ cfB cgO ciq cte -lOv -cmB +cse +rwM daw aiM xPE @@ -115737,7 +115334,7 @@ dSp gME mTU cKG -wvJ +gJg gJg gJg dbE @@ -115883,7 +115480,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -115968,13 +115565,13 @@ cgP baj cte lOv -cmB -rnT -wDg -vZh -fRh +rJq +cwG +cwG +cwG +bng nUa -mDX +kvG cwW cvH cKw @@ -116140,7 +115737,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -116227,13 +115824,13 @@ cte lGD sNJ qtr -bli +cte wfE rAm wpL -cDN +kvG +kCp kTH -oha gDC cNk vXJ @@ -116397,7 +115994,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -116482,13 +116079,13 @@ cda ciC lFv fLJ -cmB +bkp cnF -cxS -eQc +jtO +cte dcX -bpm -sJj +cte +kvG tjt nFh aZr @@ -116654,7 +116251,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -116739,13 +116336,13 @@ ces vKI cte cRX -cmB -qgw +fZc +cwG cNu cLB -dcX +nMU cha -kqO +kvG cvJ mWH wsN @@ -116911,7 +116508,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -116996,10 +116593,10 @@ cgT dZI cte csg -cmB -jcA +nUa +cwG cux -xrm +dru sBZ qnY kvG @@ -117168,7 +116765,7 @@ aaa aaa aaa aaa -laH +abq abq abq abq @@ -117253,11 +116850,11 @@ bYA chm cte csg -cmB -svV +cwG +nUa cKu -eDv -aFL +cLB +nUa cnK kvG cgY @@ -117427,7 +117024,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -117510,12 +117107,12 @@ ces xAz cte cYm -cmB -cnK +cwG +cux eAx -eDv +cte dru -cnK +jtO kvG cwH cxa @@ -117684,7 +117281,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -117767,10 +117364,10 @@ bYA cjZ cte csg -cmB +cte gND -cnK -jPj +cte +cte kqi oUs kvG @@ -117941,7 +117538,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -118024,12 +117621,12 @@ cdD chm cte rwT -cmB -cmB -cmB -cmB -cmB -cmB +uyV +cwG +cte +aYL +nUa +bng cmB cmB qub @@ -118198,7 +117795,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -118281,11 +117878,11 @@ bYA ckS cte csg -csh -coI -cte +cwG +cux +jtO ima -cte +vQU cZY dct cmB @@ -118455,7 +118052,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -118538,12 +118135,12 @@ gaa cku cte cPQ +cux +cnF cte cte cte -csh cte -clC cwG cmB hdR @@ -118558,7 +118155,7 @@ cNy bdN flh bPl -pyU +emj bPI npj xLY @@ -118799,7 +118396,7 @@ csZ kmw dcj cLF -cte +cwG cte csh cmB @@ -118820,7 +118417,7 @@ emj hYD cKJ cPc -pyU +emj bdN bdN bdN @@ -119584,7 +119181,7 @@ cBR cWK cBR cBR -pyU +emj bPl emj cPc @@ -119623,7 +119220,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -119843,11 +119440,11 @@ gqQ cBR cHq bPl -pyU +emj cPc cVn cXW -pyU +emj kqz ogE ogE @@ -119880,7 +119477,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -119997,7 +119594,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120086,7 +119683,7 @@ cte crR cuH cwG -oNn +bkp fvO cwG cyT @@ -120137,7 +119734,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120254,7 +119851,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120394,7 +119991,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120511,7 +120108,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120614,7 +120211,7 @@ gZT cBR cAS adu -pyU +emj cKr cEN cSZ @@ -120651,7 +120248,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120768,7 +120365,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -120873,10 +120470,10 @@ cPc cPc cPc cPc -pyU +emj cnW xLY -pyU +emj das cze cln @@ -120908,7 +120505,7 @@ abq abq aaa abq -laH +abq aaa aaa aaa @@ -121025,7 +120622,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121165,7 +120762,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121282,7 +120879,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121366,7 +120963,7 @@ buC aoG cYB uzY -csV +azp cte voT cqi @@ -121422,7 +121019,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121539,7 +121136,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121599,7 +121196,7 @@ asJ nWJ nWJ nWJ -qxo +asJ cJv asJ jta @@ -121679,7 +121276,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121796,7 +121393,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -121874,7 +121471,7 @@ aoG cNc czZ asJ -qxo +asJ aoG chs ckb @@ -121936,7 +121533,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122053,7 +121650,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122117,7 +121714,7 @@ aoG dbV csB nOF -qxo +asJ asJ asJ kry @@ -122128,7 +121725,7 @@ aoG aoG aoG aoG -qxo +asJ cdm asJ lRY @@ -122193,7 +121790,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122310,7 +121907,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122450,7 +122047,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122567,7 +122164,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122684,7 +122281,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122707,7 +122304,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122824,7 +122421,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -122941,30 +122538,30 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq aaa aaa aaa @@ -123081,7 +122678,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -123338,7 +122935,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -123664,7 +123261,7 @@ rUK tdA xWt axh -cCr +bUr bVM bXt csf @@ -124720,8 +124317,8 @@ abq abq abq abq -laH -laH +abq +abq abq rPS fvN @@ -124733,8 +124330,8 @@ uQm fvN rPS abq -laH -laH +abq +abq aaa aaa aaa @@ -124977,7 +124574,7 @@ abq aaa aaa aaa -laH +abq aaa aaa uQm @@ -124991,7 +124588,7 @@ cEn uQm aaa aaa -laH +abq aaa aaa aaa @@ -125234,7 +124831,7 @@ iju aaa aaa aaa -laH +abq aaa aaa fvN @@ -125248,7 +124845,7 @@ kjo fvN aaa aaa -laH +abq aaa aaa aaa @@ -125491,7 +125088,7 @@ abq aaa aaa aaa -laH +abq aaa aaa fvN @@ -125505,7 +125102,7 @@ kjo fvN aaa aaa -laH +abq aaa aaa aaa @@ -125744,8 +125341,8 @@ abq abq abq abq -laH -laH +abq +abq abq abq abq @@ -125765,8 +125362,8 @@ abq abq abq abq -laH -laH +abq +abq aaa aaa aaa @@ -126001,7 +125598,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -126023,7 +125620,7 @@ uQm aaa aaa aaa -laH +abq aaa aaa aaa @@ -126161,14 +125758,14 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq abq abq abq @@ -126258,7 +125855,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -126280,7 +125877,7 @@ hXd aaa aaa aaa -laH +abq aaa aaa aaa @@ -126418,7 +126015,7 @@ aaD aaa aaa aaa -laH +abq aaa aaa aaa @@ -126515,7 +126112,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -126537,7 +126134,7 @@ hXd aaa aaa aaa -laH +abq aaa aaa aaa @@ -126672,10 +126269,10 @@ aaa aaa aaa aaa -laH -laH -laH -laH +abq +abq +abq +abq aaa aaa aaa @@ -126929,7 +126526,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa abq @@ -127186,7 +126783,7 @@ aaa aaa aaa aaa -laH +abq abq abq cya @@ -127284,7 +126881,7 @@ abq abq aaa aaa -laH +abq aef aef nxT @@ -127310,7 +126907,7 @@ unF unF aef aef -laH +abq aaa aaa aaa @@ -127443,7 +127040,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa abq @@ -127541,7 +127138,7 @@ aaa abq aaa aaa -laH +abq aaa aaa quL @@ -127567,7 +127164,7 @@ pes adk aaa aaa -laH +abq aaa aaa aaa @@ -127700,7 +127297,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa abq @@ -127957,10 +127554,10 @@ aaa aaa aaa aaa -laH -laH -laH -laH +abq +abq +abq +abq aaa aaa cCP @@ -128055,7 +127652,7 @@ aaa abq aaa aaa -laH +abq aaa aaa nxT @@ -128081,7 +127678,7 @@ uLb unF aaa aaa -laH +abq aaa aaa aaa @@ -128217,7 +127814,7 @@ aaa aaa aaa aaa -laH +abq abq abq dch @@ -128312,7 +127909,7 @@ cqW qbf qbf aaa -laH +abq aef aef quL @@ -128338,7 +127935,7 @@ uLb adk aef aef -laH +abq aaa aaa aaa @@ -128474,7 +128071,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa cke @@ -128569,7 +128166,7 @@ cqU cqU cqW aaa -laH +abq aaa aaa nxT @@ -128595,7 +128192,7 @@ uLb unF aaa aaa -laH +abq aaa aaa aaa @@ -128731,7 +128328,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa age @@ -128988,7 +128585,7 @@ aaa aaa aaa aaa -laH +abq abq abq abq @@ -129083,7 +128680,7 @@ cqU cqU bCM aaa -laH +abq aaa aaa quL @@ -129109,7 +128706,7 @@ fZU adk aaa aaa -laH +abq aaa aaa aaa @@ -129245,7 +128842,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa ago @@ -129340,7 +128937,7 @@ qbf cqW cpt aaa -laH +abq aef aef nxT @@ -129366,7 +128963,7 @@ unF unF aef aef -laH +abq aaa aaa aaa @@ -129502,7 +129099,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa cCP @@ -129759,7 +129356,7 @@ aaa aaa aaa aaa -laH +abq abq abq dch @@ -129856,7 +129453,7 @@ aaa aaa aaa abq -laH +abq aaa quL cxU @@ -129878,7 +129475,7 @@ evr uLb adk aaa -laH +abq abq aaa aaa @@ -130016,7 +129613,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa cke @@ -130032,7 +129629,7 @@ cke cke aaa aaa -laH +abq aaa aaa aaa @@ -130113,7 +129710,7 @@ aaa aaa aaa aaa -laH +abq abq nxT cxU @@ -130135,7 +129732,7 @@ evr uLb unF abq -laH +abq aaa aaa aaa @@ -130273,7 +129870,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa age @@ -130289,7 +129886,7 @@ age age aaa aaa -laH +abq aaa aaa aaa @@ -130530,7 +130127,7 @@ aaa aaa aaa aaa -laH +abq abq abq abq @@ -130546,7 +130143,7 @@ abq abq abq abq -laH +abq aaa aaa aaa @@ -130787,7 +130384,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -130803,7 +130400,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -130903,7 +130500,7 @@ uHv uLb nkt nkt -pHF +nkt unF aaa aaa @@ -131044,23 +130641,23 @@ aaa aaa aaa aaa -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq aaa aaa aaa @@ -133754,131 +133351,195 @@ aaa aaa aaa aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -"} -(199,1,1) = {" -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +"} +(199,1,1) = {" +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abq +arA +abq +aaa +aaa +aaa +aaa +aaa +aaa +aaa +abq +abq +aef +aef +ahv +jbB +abq +aef +abq +jbB +abq +aef +aaa +aaa +aaa +aaa +aaa +aaa +abq +arA +abq aaa aaa aaa @@ -133913,76 +133574,12 @@ aaa aaa aaa abq -arA abq aaa -aaa -aaa -aaa -aaa -aaa -aaa -abq -abq -aef -aef -ahv -jbB -abq -aef -abq -jbB -abq -aef -aaa -aaa -aaa -aaa -aaa -aaa -abq -arA -abq -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -aaa -laH abq aaa abq -aaa abq -laH aaa aaa aaa @@ -135963,7 +135560,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -136003,7 +135600,7 @@ wri aQF aaa aaa -laH +abq aaa aaa aaa @@ -136220,7 +135817,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -136260,7 +135857,7 @@ wri aQF aaa aaa -laH +abq aaa aaa aaa @@ -136477,7 +136074,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -136517,7 +136114,7 @@ wri aQF aaa aaa -laH +abq aaa aaa aaa @@ -136734,7 +136331,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -136774,7 +136371,7 @@ wri aQF aaa aaa -laH +abq aaa aaa aaa @@ -136991,7 +136588,7 @@ aaa aaa aaa aaa -laH +abq bwM aXH aXN @@ -137031,7 +136628,7 @@ wri tFm aXH aaa -laH +abq aaa aaa aaa @@ -137248,7 +136845,7 @@ aaa aaa aaa aaa -laH +abq aUU hIG bbX @@ -137288,7 +136885,7 @@ rKu bbX cer aQF -laH +abq aaa aaa aaa @@ -137505,7 +137102,7 @@ aaa aaa aaa aaa -laH +abq aUU cLL bbW @@ -137545,7 +137142,7 @@ fES cUI bzh aQF -laH +abq aaa aaa aaa @@ -137762,7 +137359,7 @@ aaa aaa aaa aaa -laH +abq aXL bsG bbY @@ -137802,7 +137399,7 @@ cQc bbY cWj aXL -laH +abq aaa aaa aaa @@ -138019,7 +137616,7 @@ aaa aaa aaa aaa -laH +abq aUU cLL pkq @@ -138059,7 +137656,7 @@ ijt kXs bzh aQF -laH +abq aaa aaa aaa @@ -138276,7 +137873,7 @@ aaa aaa aaa aaa -laH +abq aUU btg bbZ @@ -138316,7 +137913,7 @@ cLL bbZ bNX aQF -laH +abq aaa aaa aaa @@ -138533,7 +138130,7 @@ aaa aaa aaa aaa -laH +abq bwM aXO bgU @@ -138573,7 +138170,7 @@ bMr xOC aXO aaa -laH +abq aaa aaa aaa @@ -138790,7 +138387,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -138830,7 +138427,7 @@ bMr aQF aaa aaa -laH +abq aaa aaa aaa @@ -139047,7 +138644,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -139087,7 +138684,7 @@ bMr aQF aaa aaa -laH +abq aaa aaa aaa @@ -139304,7 +138901,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -139344,7 +138941,7 @@ bMr aQF aaa aaa -laH +abq aaa aaa aaa @@ -139561,7 +139158,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aUU @@ -139601,7 +139198,7 @@ bMr aQF aaa aaa -laH +abq aaa aaa aaa @@ -140075,7 +139672,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -140115,7 +139712,7 @@ aWC aaa aaa aaa -laH +abq aaa aaa aaa @@ -140332,7 +139929,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -140372,7 +139969,7 @@ abq aaa aaa aaa -laH +abq aaa aaa aaa @@ -140589,7 +140186,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -140629,7 +140226,7 @@ abq aaa aaa aaa -laH +abq aaa aaa aaa @@ -140846,7 +140443,7 @@ aaa aaa aaa aaa -laH +abq aaa aaa aaa @@ -140886,7 +140483,7 @@ abq aaa aaa aaa -laH +abq aaa aaa aaa @@ -141362,43 +140959,43 @@ aaa aaa aaa aaa -laH -laH +abq +abq cKI -laH -laH -laH -laH +abq +abq +abq +abq cKI -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq cKI -laH -laH -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq +abq +abq cKI -laH -laH -laH -laH -laH -laH -laH -laH +abq +abq +abq +abq +abq +abq +abq +abq cKI -laH -laH +abq +abq aaa aaa aaa diff --git a/modular_ss220/aesthetics/racks/code/racks.dm b/modular_ss220/aesthetics/racks/code/racks.dm index d1dc5520d4d0..47a6d8f601f5 100644 --- a/modular_ss220/aesthetics/racks/code/racks.dm +++ b/modular_ss220/aesthetics/racks/code/racks.dm @@ -7,6 +7,9 @@ /obj/structure/gunrack icon = 'modular_ss220/aesthetics/racks/icons/racks.dmi' +/obj/structure/gunrack/clockwork + icon = 'icons/obj/structures.dmi' + // Return original icon path /obj/structure/rack/skeletal_bar icon = 'icons/obj/stationobjs.dmi' diff --git a/modular_ss220/maps220/code/directions.dm b/modular_ss220/maps220/code/directions.dm index aeae30d9351d..3eb17e82f06b 100644 --- a/modular_ss220/maps220/code/directions.dm +++ b/modular_ss220/maps220/code/directions.dm @@ -414,43 +414,6 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/firealarm/syndicate, 24, 24) pixel_x = 32 dir = 8 -/* NewsCaster */ -/obj/machinery/newscaster/directional - name = "\improper newscaster" - -/obj/machinery/newscaster/directional/south - pixel_y = -28 - dir = 1 - -/obj/machinery/newscaster/directional/north - pixel_y = 28 - -/obj/machinery/newscaster/directional/west - pixel_x = -28 - dir = 4 - -/obj/machinery/newscaster/directional/east - pixel_x = 28 - dir = 8 - -/obj/machinery/newscaster/security_unit - name = "\improper security newscaster" - -/obj/machinery/newscaster/security_unit/south - pixel_y = -28 - dir = 1 - -/obj/machinery/newscaster/security_unit/north - pixel_y = 28 - -/obj/machinery/newscaster/security_unit/west - pixel_x = -28 - dir = 4 - -/obj/machinery/newscaster/security_unit/east - pixel_x = 28 - dir = 8 - /* Sinks */ /obj/structure/sink/directional name = "\improper sink"