diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index d459724b568..80cd5497cf7 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -4252,16 +4252,6 @@ "aqI" = ( /turf/simulated/wall/r_wall, /area/station/security/brig) -"aqN" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/machinery/power/apc/critical/directional/north, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "aqP" = ( /obj/machinery/atmospherics/portable/canister/air, /obj/effect/decal/cleanable/dirt, @@ -25891,6 +25881,14 @@ icon_state = "cafeteria" }, /area/station/medical/reception) +"bKd" = ( +/obj/structure/table, +/obj/item/reagent_containers/glass/beaker, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "bKi" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -28331,6 +28329,25 @@ }, /turf/simulated/floor/engine, /area/station/medical/chemistry) +"bTN" = ( +/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{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "bTO" = ( /obj/machinery/light{ dir = 1 @@ -29112,6 +29129,10 @@ /obj/effect/turf_decal/delivery/hollow, /turf/simulated/floor/plasteel, /area/station/command/teleporter) +"bXq" = ( +/obj/effect/mapping_helpers/turfs/rust/maybe, +/turf/simulated/wall/r_wall, +/area/station/maintenance/asmaint2) "bXB" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -32620,9 +32641,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 @@ -33325,9 +33343,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay) -"cod" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab) "coe" = ( /obj/item/kirbyplants, /obj/machinery/power/apc/directional/south, @@ -33689,7 +33704,7 @@ /area/station/maintenance/fpmaint) "cpR" = ( /turf/simulated/wall, -/area/station/science/explab) +/area/station/science/break_room) "cpS" = ( /obj/machinery/disposal, /obj/structure/disposalpipe/trunk, @@ -34120,10 +34135,18 @@ /turf/simulated/wall/r_wall, /area/station/science/toxins/mixing) "crL" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/area/station/science/explab) +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "crM" = ( /obj/structure/table, /obj/machinery/computer/med_data/laptop{ @@ -34678,7 +34701,7 @@ "ctu" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, -/area/station/science/explab) +/area/station/science/break_room) "ctw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -35933,33 +35956,6 @@ /obj/structure/sign/electricshock, /turf/simulated/wall/r_wall, /area/station/engineering/tech_storage) -"cyw" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/circuitboard/rdconsole{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/circuitboard/rdserver{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/circuitboard/destructive_analyzer, -/obj/item/circuitboard/protolathe{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/item/circuitboard/circuit_imprinter{ - pixel_y = -6; - pixel_x = 6 - }, -/turf/simulated/floor/plating, -/area/station/engineering/tech_storage) "cyx" = ( /obj/structure/table, /obj/machinery/computer/guestpass, @@ -37024,6 +37020,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ @@ -37046,6 +37044,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/stripes/corner{ @@ -37078,14 +37078,6 @@ "cBR" = ( /turf/simulated/wall/r_wall, /area/station/science/xenobiology) -"cBS" = ( -/obj/effect/spawner/window/reinforced/plasma, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/turf/simulated/floor/plating, -/area/station/science/explab) "cBU" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -37240,26 +37232,35 @@ /turf/simulated/floor/plasteel, /area/station/medical/storage) "cCT" = ( -/obj/structure/closet/l3closet/scientist, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" +/obj/structure/chair/sofa/corp, +/obj/machinery/light{ + dir = 1 }, -/area/station/science/explab) +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "cCU" = ( -/obj/structure/closet/radiation, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" +/obj/structure/chair/sofa/corp, +/obj/machinery/camera{ + c_tag = "Research Break Room"; + dir = 6; + network = list("SS13","RD") }, -/area/station/science/explab) +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "cCV" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitepurple" +/obj/item/kirbyplants, +/obj/machinery/light_switch{ + pixel_y = 24; + name = "north bump" }, -/area/station/science/explab) +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "cCW" = ( /turf/simulated/wall, /area/station/medical/surgery/primary) @@ -37701,24 +37702,15 @@ /turf/simulated/floor/plasteel, /area/station/engineering/controlroom) "cEk" = ( -/obj/structure/table, -/obj/item/clipboard, -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/status_display{ - pixel_y = -32 +/obj/machinery/economy/vending/scidrobe, +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "cEp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment, @@ -38025,9 +38017,13 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -38198,12 +38194,12 @@ /turf/simulated/floor/plasteel, /area/station/engineering/break_room) "cGu" = ( -/obj/machinery/power/apc/directional/south, -/obj/structure/cable, +/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) "cGv" = ( /obj/machinery/camera{ c_tag = "Atmospherics Control Room" @@ -39316,6 +39312,8 @@ /area/station/engineering/atmos/control) "cKs" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -39616,6 +39614,8 @@ /area/station/public/dorms) "cLQ" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -39883,13 +39883,12 @@ /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) "cMS" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, +/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) "cMT" = ( /obj/structure/cable{ icon_state = "1-2" @@ -39990,6 +39989,8 @@ /obj/effect/spawner/random/barrier/grille_maybe, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -40019,6 +40020,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -46885,6 +46888,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -48515,15 +48520,6 @@ }, /turf/simulated/floor/plating, /area/station/command/bridge) -"dHF" = ( -/obj/machinery/firealarm/directional/west, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "dHH" = ( /obj/machinery/conveyor{ dir = 1; @@ -49743,15 +49739,6 @@ }, /turf/simulated/floor/plating, /area/station/security/permabrig) -"eiy" = ( -/obj/machinery/hologram/holopad, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "eiE" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ dir = 10 @@ -49855,6 +49842,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -50309,6 +50298,8 @@ "eyl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -51507,6 +51498,8 @@ /area/station/maintenance/port) "fef" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -51751,6 +51744,25 @@ icon_state = "dark" }, /area/station/maintenance/asmaint) +"fjn" = ( +/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 = "cafeteria" + }, +/area/station/science/break_room) "fjx" = ( /obj/structure/closet/secure_closet/research_reagents, /turf/simulated/floor/engine, @@ -51969,6 +51981,8 @@ dir = 5 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -52693,20 +52707,6 @@ icon_state = "dark" }, /area/station/engineering/control) -"fGz" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "fGI" = ( /obj/machinery/light/small{ dir = 1 @@ -52806,14 +52806,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/engineering/smes) -"fJy" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "fJK" = ( /obj/structure/rack{ dir = 1 @@ -53148,6 +53140,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -53739,6 +53733,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/bluegrid, @@ -54059,6 +54055,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/bluegrid, @@ -55496,12 +55494,6 @@ }, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) -"hcE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "hdr" = ( /turf/simulated/floor/plasteel{ dir = 8; @@ -55763,6 +55755,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) +"hlw" = ( +/obj/effect/decal/cleanable/glass, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "hmu" = ( /obj/machinery/recharge_station, /obj/effect/decal/cleanable/dirt, @@ -56452,6 +56448,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -56472,6 +56470,8 @@ "hGb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -58065,6 +58065,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -58330,6 +58332,18 @@ dir = 10 }, /area/station/public/dorms) +"iHi" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/newscaster{ + dir = 4; + name = "west bump"; + pixel_x = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "iHE" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -58611,14 +58625,13 @@ /turf/simulated/wall/r_wall, /area/station/engineering/transmission_laser) "iQJ" = ( -/obj/machinery/firealarm/directional/west, +/obj/structure/chair/sofa/corp/right, +/obj/effect/landmark/start/scientist, /obj/machinery/alarm/directional/north, -/obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "iQP" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -59043,13 +59056,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) -"jcc" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/obj/machinery/light, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "jcY" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -59464,6 +59470,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -59547,9 +59555,13 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -59787,12 +59799,12 @@ /turf/simulated/floor/plating, /area/station/supply/miningdock) "jvM" = ( -/obj/structure/closet/emcloset, +/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) "jwb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -59876,15 +59888,14 @@ /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) "jxy" = ( -/obj/machinery/door_control{ - id = "telescienceblast"; - name = "Test Chamber Blast Door Control"; - pixel_y = -24 +/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) "jyo" = ( /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/slime, @@ -61416,6 +61427,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"knT" = ( +/obj/structure/disposalpipe/trunk, +/obj/machinery/disposal, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "kok" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -62289,6 +62307,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -63836,6 +63856,8 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -63894,34 +63916,6 @@ /obj/structure/flora/grass/jungle, /turf/simulated/floor/grass/jungle/no_creep, /area/station/command/bridge) -"lBO" = ( -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/machinery/door/firedoor, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable{ - 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{ - icon_state = "white" - }, -/area/station/science/explab) -"lBQ" = ( -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "lCQ" = ( /obj/structure/closet/emcloset, /obj/structure/sign/poster/official/random{ @@ -64095,9 +64089,13 @@ dir = 6 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -64661,7 +64659,7 @@ /turf/simulated/floor/carpet, /area/station/supply/qm) "lTr" = ( -/obj/machinery/r_n_d/destructive_analyzer, +/obj/machinery/r_n_d/scientific_analyzer, /turf/simulated/floor/plasteel{ dir = 5; icon_state = "purple" @@ -64974,6 +64972,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -65583,6 +65583,20 @@ /obj/effect/spawner/random/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) +"mty" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/hallway) "muh" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -65859,6 +65873,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -65909,24 +65925,10 @@ /turf/simulated/floor/plating, /area/station/maintenance/fpmaint2) "mEI" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/sop_science{ - pixel_y = 3; - pixel_x = -3 - }, -/obj/item/book/manual/wiki/experimentor, -/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("Experimentor"); - pixel_x = -32 - }, /turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "mEJ" = ( /obj/structure/closet/emcloset, /obj/machinery/atmospherics/pipe/simple/hidden/purple{ @@ -66064,6 +66066,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -66254,6 +66258,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -66261,6 +66267,14 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint2) +"mMa" = ( +/obj/structure/chair/stool{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "mMk" = ( /obj/structure/table, /obj/item/clothing/gloves/color/fyellow{ @@ -66422,15 +66436,6 @@ icon_state = "bluered" }, /area/station/public/dorms) -"mQC" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/station/science/explab) "mQX" = ( /obj/structure/barricade/wooden, /obj/effect/spawner/window/reinforced, @@ -67048,6 +67053,12 @@ icon_state = "dark" }, /area/station/turret_protected/ai) +"nmC" = ( +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "nmO" = ( /obj/structure/closet/secure_closet/paramedic, /obj/machinery/alarm/directional/east, @@ -67275,6 +67286,17 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/west) +"nur" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "nus" = ( /obj/structure/cable{ icon_state = "1-2" @@ -68700,6 +68722,13 @@ /obj/structure/bookcase, /turf/simulated/floor/wood, /area/station/security/permabrig) +"ogf" = ( +/obj/structure/cable, +/obj/machinery/power/apc/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "ogh" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -68993,13 +69022,6 @@ icon_state = "darkbluefull" }, /area/station/medical/surgery/primary) -"olg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/alarm/directional/south, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "olG" = ( /obj/machinery/atmospherics/unary/vent_pump/siphon/on{ dir = 8; @@ -69203,20 +69225,11 @@ /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "oqc" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, +/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) "oqF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/reinforced/normal{ @@ -69312,6 +69325,7 @@ "osZ" = ( /obj/machinery/power/apc/directional/north, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /obj/structure/window/reinforced{ @@ -69564,10 +69578,6 @@ icon_state = "whitepurple" }, /area/station/science/rnd) -"oyY" = ( -/obj/effect/mapping_helpers/turfs/rust/maybe, -/turf/simulated/wall/r_wall, -/area/station/maintenance/asmaint2) "ozk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -69637,6 +69647,8 @@ /obj/effect/mapping_helpers/airlock/access/any/medical/genetics, /obj/effect/mapping_helpers/airlock/access/any/science/research, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -69812,6 +69824,18 @@ /obj/machinery/light, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) +"oFo" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/cyan, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "oFq" = ( /obj/item/assembly/timer{ pixel_x = -5; @@ -70086,6 +70110,12 @@ icon_state = "white" }, /area/station/medical/virology) +"oJZ" = ( +/obj/structure/sign/poster/official/science{ + pixel_x = 30 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "oKi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -70505,6 +70535,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -70857,12 +70889,6 @@ icon_state = "grimy" }, /area/station/command/office/hop) -"pgJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "pgV" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -71082,6 +71108,10 @@ icon_state = "dark" }, /area/station/security/execution) +"pma" = ( +/obj/machinery/light/small, +/turf/simulated/floor/plating, +/area/station/maintenance/asmaint2) "pmZ" = ( /obj/structure/cable{ icon_state = "1-2" @@ -71149,6 +71179,31 @@ }, /turf/simulated/floor/engine, /area/station/science/misc_lab) +"ppl" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/circuitboard/rdconsole{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/circuitboard/rdserver{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/circuitboard/scientific_analyzer, +/obj/item/circuitboard/protolathe{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/engineering/tech_storage) "ppo" = ( /obj/structure/cable{ icon_state = "4-8" @@ -71584,15 +71639,6 @@ icon_state = "yellowcorner" }, /area/station/hallway/primary/aft/south) -"pAs" = ( -/obj/effect/spawner/window/reinforced/plasma, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/obj/structure/sign/securearea, -/turf/simulated/floor/plating, -/area/station/science/explab) "pAJ" = ( /obj/structure/flora/tree/jungle, /turf/simulated/floor/grass/jungle/no_creep, @@ -71905,6 +71951,7 @@ "pKi" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /turf/simulated/floor/plasteel{ @@ -71923,9 +71970,13 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel{ @@ -72311,6 +72362,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -72550,6 +72603,8 @@ /area/station/command/bridge) "qcy" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -72710,6 +72765,20 @@ }, /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior) +"qgO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/hallway) "qhe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -74077,13 +74146,14 @@ }, /area/station/medical/storage) "qId" = ( -/obj/machinery/requests_console/directional/east, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" +/obj/structure/extinguisher_cabinet{ + name = "east bump"; + pixel_x = 27 }, -/area/station/science/explab) +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "qIg" = ( /obj/structure/chair/office/dark, /obj/effect/landmark/start/quartermaster, @@ -74259,6 +74329,14 @@ /obj/structure/grille/broken, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) +"qNO" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "qOn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -74940,23 +75018,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"rfu" = ( -/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/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "rgb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -74965,10 +75026,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"rgc" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "rgq" = ( /obj/structure/chair/comfy/black{ dir = 8 @@ -75328,6 +75385,8 @@ dir = 5 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/effect/decal/cleanable/glass, @@ -75503,18 +75562,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/science/lobby) -"rvG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "rwc" = ( /obj/structure/cable{ icon_state = "4-8" @@ -76086,10 +76133,6 @@ icon_state = "freezerfloor" }, /area/station/security/permabrig) -"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, @@ -76291,6 +76334,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -76980,9 +77025,13 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -77279,14 +77328,11 @@ /turf/simulated/floor/plasteel, /area/station/hallway/primary/aft/south) "stX" = ( -/obj/structure/chair/office/light{ - dir = 8 - }, /obj/effect/landmark/start/scientist, /turf/simulated/floor/plasteel{ - icon_state = "white" + icon_state = "cafeteria" }, -/area/station/science/explab) +/area/station/science/break_room) "sud" = ( /obj/machinery/atmospherics/unary/portables_connector{ dir = 1 @@ -77616,24 +77662,6 @@ /obj/machinery/space_heater, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"sEv" = ( -/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/disposalpipe/segment/corner{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/explab) "sFl" = ( /obj/structure/chair, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -77789,6 +77817,19 @@ /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) +"sJM" = ( +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/hallway) "sJQ" = ( /obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, @@ -78071,11 +78112,11 @@ pixel_x = -28 }, /obj/structure/table/glass/reinforced, -/obj/item/ai_module/corp{ - pixel_y = 3; - pixel_x = 3 +/obj/item/ai_module/nanotrasen{ + pixel_x = 4; + pixel_y = 3 }, -/obj/item/ai_module/nanotrasen, +/obj/item/ai_module/corp, /turf/simulated/floor/plasteel{ icon_state = "dark" }, @@ -78860,20 +78901,6 @@ icon_state = "blue" }, /area/station/hallway/primary/central/sw) -"tpO" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "tpP" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -78937,24 +78964,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/medical/morgue) -"ttp" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/obj/effect/turf_decal/stripes, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab) "ttv" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp/green/off{ @@ -79158,6 +79167,18 @@ /obj/effect/turf_decal/delivery/green/hollow, /turf/simulated/floor/plasteel, /area/station/service/janitor) +"tzi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/hallway) "tzm" = ( /obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall/r_wall, @@ -79253,13 +79274,19 @@ /turf/simulated/floor/carpet/green, /area/station/command/bridge) "tCE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 1 +/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) "tCK" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -79612,6 +79639,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -80584,15 +80613,21 @@ /obj/structure/disaster_counter/toxins, /turf/simulated/wall/r_wall, /area/station/science/toxins/launch) -"uij" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "ujR" = ( /obj/structure/chair/sofa/corp{ dir = 1 }, /turf/simulated/floor/carpet/green, /area/station/command/bridge) +"ukt" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/economy/vending/coffee, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "uku" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -80756,6 +80791,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -81033,21 +81070,6 @@ }, /turf/simulated/floor/engine, /area/station/maintenance/incinerator) -"uwG" = ( -/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" - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/station/science/explab) "uwJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 @@ -81121,8 +81143,8 @@ /obj/machinery/alarm/directional/west, /obj/structure/table/glass/reinforced, /obj/item/ai_module/crewsimov{ - pixel_y = 3; - pixel_x = -3 + pixel_x = -3; + pixel_y = 4 }, /obj/item/ai_module/reset, /turf/simulated/floor/plasteel{ @@ -81151,6 +81173,14 @@ /obj/effect/landmark/start/explorer, /turf/simulated/floor/plasteel, /area/station/supply/expedition) +"uAd" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = -32 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "uAo" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -81540,17 +81570,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/command/bridge) -"uMJ" = ( -/obj/structure/table, -/obj/item/folder, -/obj/item/folder, -/obj/item/radio, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/explab) "uMU" = ( /obj/structure/disposalpipe/segment, /obj/structure/grille/broken, @@ -83423,6 +83442,12 @@ }, /turf/simulated/floor/wood, /area/station/security/permabrig) +"vNm" = ( +/obj/machinery/economy/vending/snack, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "vNn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -83517,14 +83542,6 @@ }, /turf/simulated/floor/wood, /area/station/maintenance/apmaint2) -"vRJ" = ( -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Chamber"; - dir = 4; - network = list("Experimentor","Research","SS13") - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "vRY" = ( /obj/structure/cable{ icon_state = "4-8" @@ -84865,6 +84882,8 @@ /area/station/engineering/gravitygenerator) "wEl" = ( /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -84939,6 +84958,8 @@ /obj/effect/mapping_helpers/airlock/access/any/command/ai_upload, /obj/machinery/door/firedoor, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -85254,6 +85275,13 @@ icon_state = "dark" }, /area/station/turret_protected/ai_upload) +"wOw" = ( +/obj/structure/table, +/obj/item/reagent_containers/drinks/mug/sci, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "wOx" = ( /obj/effect/mapping_helpers/airlock/windoor/access/any/medical/general, /obj/machinery/door/firedoor, @@ -86177,23 +86205,6 @@ icon_state = "brown" }, /area/station/supply/qm) -"xpm" = ( -/obj/item/radio/intercom{ - name = "south bump"; - pixel_y = -28 - }, -/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/stack/package_wrap, -/obj/item/hand_labeler, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "xpJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera{ @@ -86221,6 +86232,8 @@ /area/station/maintenance/aft) "xqp" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -86232,6 +86245,8 @@ /obj/effect/turf_decal/stripes/line, /obj/structure/disposalpipe/segment, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -86735,6 +86750,31 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/security/permabrig) +"xDy" = ( +/obj/machinery/door/airlock/research{ + name = "Research Division Access" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/research, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "xDS" = ( /obj/structure/cable{ icon_state = "4-8" @@ -86760,6 +86800,17 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/science/toxins/launch) +"xEv" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "cafeteria" + }, +/area/station/science/break_room) "xEw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -88094,6 +88145,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -115687,7 +115740,7 @@ clr cgQ cvy cwW -cyw +ppl czm cBs cwO @@ -131886,7 +131939,7 @@ eyl tLJ eyl eyl -eyl +oFo eyl cNs eyl @@ -132402,13 +132455,13 @@ cuQ bGG cKQ jxu -oyY +bXq bGG bKl dgy dbg cLQ -bGG +pma qZN gGQ taM @@ -132659,11 +132712,11 @@ cuQ xWm cKQ bGG -clp -clp -clp -clp -clp +dCw +bGG +qZN +bXq +bXq pUR bGG qZN @@ -132916,11 +132969,11 @@ cuQ bGG cEE bGG -clp -lBQ -vRJ -dHF -clp +qZN +bGG +bGG +hlw +bGG cLQ bGG qZN @@ -133173,11 +133226,11 @@ cuQ lpS cLc bGG -clp -hcE -rLY -jcc -clp +bXq +bYk +bKd +oJZ +bGG cLQ bGG qZN @@ -133430,11 +133483,11 @@ cuQ bGG bGG bGG -clp -aqN -uij -pgJ -clp +cpR +cpR +cpR +cpR +cpR cLQ bGG qZN @@ -133687,11 +133740,11 @@ bvX bvX bvX bvX -clp -rvG -rgc -olg -clp +cpR +iHi +ukt +vNm +cpR wEl rqq qZN @@ -133944,11 +133997,11 @@ kQg uzd wOr bvX +knT +nur +qNO +uAd cpR -ttp -pAs -cBS -cod cpR oVH qZN @@ -134202,8 +134255,8 @@ byP pHN bvX iQJ -uwG -mQC +xEv +mMa mEI cEk cpR @@ -134459,7 +134512,7 @@ bxq tGv bvX cCU -tpO +xEv cMS stX jxy @@ -134716,9 +134769,9 @@ byP cHz bvX cCT -rfu -eiy -fJy +xEv +wOw +nmC cGu cpR mLY @@ -134973,10 +135026,10 @@ uAQ wQp bvX jvM -fGz +fjn tCE crL -xpm +ogf cpR rSr gAw @@ -135230,8 +135283,8 @@ ekp arq bvX cCV -sEv -uMJ +bTN +mEI qId oqc cpR @@ -135487,7 +135540,7 @@ bvX bvX bvX ctu -lBO +xDy ctu cpR cpR @@ -135993,14 +136046,14 @@ lkd fbS kcJ chW -cDC -chW -chW +sJM +tzi +tzi cFH -chW -cdi +tzi +qgO mdt -fbS +mty pLR izl oBf diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index 383452bae88..79b40761d79 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -2207,9 +2207,13 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/disposalpipe/segment, @@ -7629,6 +7633,9 @@ icon_state = "yellow" }, /area/station/public/storage/tools/auxiliary) +"bkQ" = ( +/turf/simulated/floor/plasteel/white, +/area/station/science/hallway) "bkU" = ( /turf/simulated/wall, /area/station/public/storage/tools) @@ -14126,9 +14133,13 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel/white, @@ -15137,6 +15148,8 @@ dir = 8 }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -17543,6 +17556,7 @@ name = "containment door 5" }, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -17720,6 +17734,8 @@ /area/station/service/clown/secret) "cpI" = ( /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -17852,6 +17868,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -17865,6 +17883,8 @@ /area/station/science/hallway) "cqD" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -18080,8 +18100,9 @@ /area/station/command/meeting_room) "csA" = ( /obj/structure/closet/l3closet/scientist, +/obj/machinery/firealarm/directional/south, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" + icon_state = "whitepurple" }, /area/station/science/hallway) "csJ" = ( @@ -18109,6 +18130,8 @@ /area/station/command/meeting_room) "csL" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/landmark/start/scientist, @@ -18144,14 +18167,20 @@ }, /area/station/supply/expedition) "ctb" = ( -/obj/structure/table/reinforced, -/obj/item/hand_labeler_refill, -/obj/item/hand_labeler, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -2; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -2; + pixel_y = 5 + }, /turf/simulated/floor/plasteel{ dir = 8; icon_state = "whitepurple" }, -/area/station/science/explab/chamber) +/area/station/science/hallway) "ctc" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -18212,26 +18241,26 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel/dark/telecomms, /area/station/science/server) "ctQ" = ( -/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/structure/table, +/obj/machinery/newscaster{ + dir = 4; + name = "west bump"; + pixel_x = -28 }, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/experimentor, +/obj/item/clothing/gloves/color/latex, /turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" + dir = 8; + icon_state = "whitepurple" }, -/area/station/science/explab/chamber) +/area/station/science/hallway) "ctV" = ( /obj/machinery/economy/vending/coffee, /turf/simulated/floor/plasteel{ @@ -18274,6 +18303,8 @@ /area/station/hallway/secondary/exit) "cuD" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -18286,6 +18317,8 @@ dir = 1 }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel/white, @@ -18330,38 +18363,30 @@ }, /area/station/security/execution) "cuQ" = ( -/obj/machinery/door_control{ - id = "telescienceblast"; - name = "E.X.P.E.R.I-MENTOR Blast Doors"; - pixel_y = -25 - }, -/obj/machinery/computer/rdconsole/experiment{ - dir = 4 +/obj/structure/chair/sofa/corner{ + dir = 1; + color = "#A30FAF" }, /turf/simulated/floor/plasteel{ + dir = 10; icon_state = "whitepurple" }, -/area/station/science/explab/chamber) +/area/station/science/hallway) "cuR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel{ icon_state = "chapel" }, /area/station/service/chapel) -"cuU" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "cuV" = ( -/turf/simulated/wall, -/area/station/science/explab/chamber) +/obj/machinery/camera{ + c_tag = "Research Eastern Wing 1"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, +/area/station/science/hallway) "cuW" = ( /obj/machinery/atmospherics/unary/thermomachine/freezer/on/coldroom{ dir = 4 @@ -18603,9 +18628,12 @@ "cxq" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ + d2 = 2; icon_state = "0-2" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -18685,11 +18713,14 @@ }, /area/station/service/kitchen) "cyi" = ( -/obj/machinery/light{ - dir = 8 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "cyj" = ( /obj/structure/table/reinforced, /obj/item/storage/box/beakers, @@ -18781,6 +18812,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/spawner/random/dirt/often, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -18791,6 +18824,8 @@ "czb" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -19104,6 +19139,8 @@ /area/station/security/lobby) "cBM" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -19132,6 +19169,8 @@ /area/station/hallway/primary/fore/north) "cBR" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -22972,6 +23011,8 @@ /area/station/maintenance/apmaint) "daR" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -23075,6 +23116,7 @@ "dcp" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /obj/machinery/firealarm/directional/north, @@ -24100,7 +24142,7 @@ }, /area/station/command/meeting_room) "djd" = ( -/obj/machinery/r_n_d/destructive_analyzer, +/obj/machinery/r_n_d/scientific_analyzer, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "darkpurple" @@ -25673,6 +25715,8 @@ /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -26352,6 +26396,8 @@ /area/station/maintenance/port2) "dCe" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -26359,6 +26405,8 @@ dir = 9 }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel/dark/telecomms, @@ -27240,13 +27288,6 @@ /obj/machinery/hologram/holopad, /turf/simulated/floor/wood, /area/station/service/clown) -"dNJ" = ( -/obj/machinery/power/apc/directional/south, -/obj/structure/cable/orange, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab/chamber) "dNS" = ( /obj/machinery/computer/rnd_backup/station{ dir = 8 @@ -27974,6 +28015,8 @@ "dVO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -28524,9 +28567,7 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, +/turf/simulated/floor/plasteel/white, /area/station/science/hallway) "efv" = ( /obj/machinery/computer/secure_data{ @@ -29199,6 +29240,8 @@ /area/station/maintenance/fore2) "enS" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -30487,6 +30530,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -30575,23 +30620,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/port) -"eHo" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/obj/structure/cable/orange{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "eHu" = ( /obj/structure/falsewall/rock_ancient, /turf/simulated/floor/plating, @@ -30778,9 +30806,13 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -31906,6 +31938,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, +/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel/white, /area/station/command/office/rd) "faM" = ( @@ -32184,11 +32217,6 @@ }, /turf/simulated/floor/catwalk, /area/station/maintenance/fore) -"ffL" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "fgi" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -32636,6 +32664,8 @@ /area/station/maintenance/apmaint) "fmH" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/hologram/holopad, @@ -33223,6 +33253,8 @@ /area/station/hallway/secondary/exit) "fvk" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -33850,9 +33882,12 @@ id = "rd" }, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -33958,20 +33993,6 @@ icon_state = "bar" }, /area/station/security/permabrig) -"fHA" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "fHC" = ( /obj/structure/table/wood/fancy/red, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -34836,14 +34857,14 @@ /turf/simulated/floor/plating, /area/station/hallway/primary/central/west) "fSl" = ( -/obj/structure/chair/office/light{ - dir = 8 +/obj/structure/chair/sofa/right{ + dir = 1; + color = "#A30FAF" }, -/obj/machinery/alarm/directional/south, /turf/simulated/floor/plasteel{ icon_state = "whitepurple" }, -/area/station/science/explab/chamber) +/area/station/science/hallway) "fSn" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -35364,6 +35385,27 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/hallway/primary/port/north) +"gax" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/window/classic/normal{ + dir = 1; + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio{ + dir = 1 + }, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, +/area/station/science/xenobiology) "gaB" = ( /obj/structure/disposalpipe/segment{ color = "#954535" @@ -37232,11 +37274,12 @@ }, /area/station/science/genetics) "gEJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/obj/machinery/light/small, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/turf/simulated/floor/wood, +/area/station/command/office/rd) "gEQ" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange, @@ -38151,7 +38194,7 @@ "gTe" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" + icon_state = "whitepurple" }, /area/station/science/hallway) "gTt" = ( @@ -39292,6 +39335,7 @@ name = "containment door 1" }, /obj/structure/cable/orange{ + d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plating, @@ -41375,9 +41419,13 @@ dir = 5 }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel/white, @@ -41392,6 +41440,8 @@ /area/station/service/bar) "hKm" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -41597,14 +41647,17 @@ /turf/simulated/floor/plating, /area/station/maintenance/starboard) "hMY" = ( -/obj/structure/closet/secure_closet/rd, -/obj/item/cartridge/signal/toxins, -/obj/item/cartridge/signal/toxins, -/obj/item/cartridge/signal/toxins, /obj/machinery/power/apc/directional/east, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-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 = "cafeteria" }, @@ -41699,6 +41752,14 @@ }, /turf/simulated/floor/wood, /area/station/service/theatre) +"hOF" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/xenobiology) "hOG" = ( /obj/effect/spawner/random/dirt/frequent, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -42431,13 +42492,6 @@ icon_state = "darkpurple" }, /area/station/science/robotics) -"hYb" = ( -/obj/machinery/light, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab/chamber) "hYe" = ( /obj/machinery/navbeacon{ codes_txt = "delivery"; @@ -43862,17 +43916,6 @@ /obj/item/coin/antagtoken, /turf/simulated/floor/plating, /area/station/turret_protected/aisat/interior/secondary) -"ipD" = ( -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "telescienceblast"; - name = "test chamber blast doors"; - opacity = 0 - }, -/obj/effect/spawner/window/reinforced/plasma, -/turf/simulated/floor/plating, -/area/station/science/explab/chamber) "ipE" = ( /obj/structure/table, /obj/item/food/mint, @@ -44268,6 +44311,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/autoname, @@ -45751,21 +45796,6 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/fore/west) -"iNK" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/machinery/door/airlock/research/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/science/research, -/obj/machinery/door/firedoor, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "iNM" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ @@ -46100,6 +46130,8 @@ /area/station/hallway/spacebridge/comeng) "iSu" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/disposalpipe/segment/corner{ @@ -46256,9 +46288,13 @@ name = "containment door 5" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/door/window/classic/normal{ @@ -46324,6 +46360,8 @@ /area/station/security/storage) "iVB" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -46626,6 +46664,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -48500,6 +48540,8 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/heat_exchanging/junction{ @@ -51755,6 +51797,24 @@ icon_state = "whitepurple" }, /area/station/science/genetics) +"kkM" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/camera{ + c_tag = "Research Break Wing"; + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/station/science/hallway) "kkS" = ( /obj/structure/cable{ icon_state = "2-4" @@ -52591,9 +52651,13 @@ dir = 1 }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel/white, @@ -52609,6 +52673,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel/white, @@ -52727,6 +52793,8 @@ "kxo" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/junction{ @@ -52734,6 +52802,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel/white, @@ -53050,6 +53120,16 @@ icon_state = "dark" }, /area/station/service/hydroponics) +"kAW" = ( +/obj/structure/sign/nosmoking_2{ + pixel_y = 32 + }, +/obj/item/kirbyplants, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitepurple" + }, +/area/station/science/hallway) "kAX" = ( /obj/machinery/door/airlock/glass{ id_tag = "magistrateofficedoor" @@ -54516,6 +54596,8 @@ /area/station/maintenance/apmaint) "kVq" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -55180,11 +55262,12 @@ }, /area/station/hallway/primary/fore/north) "lfq" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/machinery/suit_storage_unit/rd/secure, +/obj/item/toy/figure/crew/rd{ + pixel_y = 15 }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/turf/simulated/floor/wood, +/area/station/command/office/rd) "lfy" = ( /obj/machinery/computer/supplycomp{ dir = 1 @@ -56396,9 +56479,13 @@ "ltP" = ( /obj/machinery/door/firedoor, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/door/airlock/command/glass{ @@ -56413,6 +56500,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel, @@ -56439,7 +56528,8 @@ "luB" = ( /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel{ - icon_state = "whitepurple" + dir = 8; + icon_state = "whitepurplecorner" }, /area/station/science/hallway) "luI" = ( @@ -56688,9 +56778,13 @@ /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/visible, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/door/airlock/research{ @@ -56994,6 +57088,20 @@ /obj/item/kirbyplants/plant22, /turf/simulated/floor/plasteel, /area/station/public/dorms) +"lBK" = ( +/obj/structure/cable/orange{ + 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/white, +/area/station/science/xenobiology) "lBW" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/firedoor, @@ -58301,6 +58409,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/junction/reversed{ @@ -58319,6 +58429,7 @@ name = "containment door 1" }, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -58870,11 +58981,17 @@ /area/station/hallway/primary/port/south) "lZS" = ( /obj/machinery/hologram/holopad, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -59237,11 +59354,11 @@ }, /area/station/science/test_chamber) "meg" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/structure/bed, +/obj/item/bedsheet/rd, +/obj/item/toy/plushie/robo_corgi, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "met" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -60424,6 +60541,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment/corner, @@ -61188,6 +61307,20 @@ icon_state = "dark" }, /area/station/engineering/control) +"mFs" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/apmaint) "mFJ" = ( /obj/effect/spawner/random/dirt/frequent, /obj/machinery/firealarm/directional/north, @@ -61408,15 +61541,10 @@ /turf/simulated/floor/wood, /area/station/maintenance/fore) "mJd" = ( -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Chamber"; - network = list("RD","SS13") - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/firealarm/directional/north, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "mJk" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -62043,6 +62171,19 @@ icon_state = "darkgreenfull" }, /area/station/service/hydroponics) +"mRN" = ( +/obj/machinery/door/airlock/command, +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/door/firedoor, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "mSh" = ( /obj/structure/girder, /turf/simulated/floor/plating, @@ -62124,6 +62265,7 @@ name = "containment door 5" }, /obj/structure/cable/orange{ + d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plating, @@ -62579,9 +62721,14 @@ }, /area/station/supply/qm) "mYx" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "mYF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -62989,9 +63136,12 @@ id = "rd" }, /obj/structure/cable/orange{ + d2 = 4; icon_state = "0-4" }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -64049,6 +64199,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/disposalpipe/segment, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -65100,6 +65252,7 @@ id = "rd" }, /obj/structure/cable/orange{ + d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plating, @@ -65473,7 +65626,7 @@ "nMt" = ( /obj/structure/closet/firecloset/full, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" + icon_state = "whitepurple" }, /area/station/science/hallway) "nMA" = ( @@ -65711,35 +65864,6 @@ /obj/effect/turf_decal/caution/stand_clear, /turf/simulated/floor/plasteel, /area/station/security/processing) -"nQw" = ( -/obj/machinery/camera{ - c_tag = "Research Test Lab North"; - dir = 8; - network = list("RD","SS13"); - pixel_y = -22 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/obj/structure/cable/orange{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment/corner, -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Lab"; - dir = 8; - network = list("RD","SS13"); - pixel_y = -22 - }, -/turf/simulated/floor/plasteel{ - dir = 5; - icon_state = "whitepurple" - }, -/area/station/science/explab/chamber) "nQC" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -67360,20 +67484,10 @@ /turf/simulated/floor/plasteel, /area/station/service/janitor) "ooj" = ( -/obj/machinery/camera{ - c_tag = "Research Eastern Wing"; - dir = 1 - }, /obj/structure/disposalpipe/segment/corner{ dir = 1 }, -/obj/structure/extinguisher_cabinet{ - pixel_y = -28; - name = "custom placement" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, +/turf/simulated/floor/plasteel/white, /area/station/science/hallway) "oop" = ( /obj/machinery/light{ @@ -69774,11 +69888,15 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, /obj/effect/spawner/random/dirt/frequent, /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel{ @@ -69999,21 +70117,6 @@ /obj/structure/table, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"oXs" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/obj/machinery/hologram/holopad, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "oXu" = ( /obj/structure/cable{ icon_state = "2-8" @@ -70272,12 +70375,16 @@ dir = 1 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/structure/disposalpipe/sortjunction/reversed{ @@ -71001,6 +71108,7 @@ /area/shuttle/arrival/station) "pku" = ( /obj/structure/cable/orange{ + d2 = 4; icon_state = "0-4" }, /obj/effect/spawner/window/reinforced/grilled, @@ -71968,6 +72076,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -72848,8 +72958,12 @@ }, /area/station/public/storefront) "pII" = ( -/obj/machinery/suit_storage_unit/rd/secure, -/obj/machinery/alarm/directional/east, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, /turf/simulated/floor/plasteel{ icon_state = "cafeteria" }, @@ -73237,6 +73351,8 @@ dir = 10 }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/simulated/floor/plating{ @@ -73328,6 +73444,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -73647,6 +73765,7 @@ /obj/machinery/firealarm/directional/south, /obj/machinery/power/apc/directional/east, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plasteel{ @@ -75224,6 +75343,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -75721,6 +75842,8 @@ /area/station/service/chapel/office) "qtW" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -75801,9 +75924,6 @@ /obj/item/pickaxe, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) -"quI" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) "quK" = ( /obj/effect/turf_decal/stripes/corner{ dir = 1 @@ -76340,27 +76460,6 @@ }, /turf/space, /area/station/engineering/solar/fore_port) -"qBl" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab/chamber) "qBm" = ( /turf/simulated/floor/plasteel{ icon_state = "white" @@ -76751,9 +76850,13 @@ name = "containment door 1" }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/door/window/classic/normal{ @@ -76810,6 +76913,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ @@ -77007,6 +77112,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -77072,6 +77179,23 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/checkpoint/secondary) +"qMc" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/hallway) "qMg" = ( /obj/machinery/door/airlock/public/glass{ name = "Walkway" @@ -78120,6 +78244,8 @@ /area/station/science/hallway) "qZD" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -79366,6 +79492,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating{ @@ -79452,27 +79580,6 @@ /obj/structure/closet/secure_closet/brig/temp/cell_1, /turf/simulated/floor/plasteel, /area/station/security/prison/cell_block/a) -"rvL" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/cable/orange{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/cable/orange{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab/chamber) "rvO" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -79863,6 +79970,8 @@ /area/station/science/toxins/mixing) "rBW" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -81206,6 +81315,11 @@ icon_state = "floorgrime" }, /area/station/security/permabrig) +"rSm" = ( +/obj/structure/closet/secure_closet/rd, +/obj/item/cartridge/signal/toxins, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "rSq" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/orange{ @@ -81389,8 +81503,9 @@ }, /area/station/maintenance/apmaint) "rUV" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/structure/dresser, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "rUX" = ( /obj/machinery/conveyor/auto{ dir = 1 @@ -81869,6 +81984,19 @@ icon_state = "neutral" }, /area/station/public/storage/tools) +"saY" = ( +/obj/structure/sign/poster/random{ + name = "random official poster"; + pixel_x = 32; + random_basetype = /obj/structure/sign/poster/official + }, +/obj/structure/table, +/obj/item/toy/figure/crew/scientist, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple"; + dir = 4 + }, +/area/station/science/hallway) "sbf" = ( /obj/effect/landmark/start/shaft_miner, /obj/structure/cable/orange{ @@ -82122,15 +82250,14 @@ /turf/simulated/floor/wood, /area/station/command/office/ntrep) "sdP" = ( -/obj/item/beacon, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/table/wood, +/obj/item/flashlight/lamp, +/obj/item/radio/intercom{ + pixel_x = 28; + name = "custom placement" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/turf/simulated/floor/wood, +/area/station/command/office/rd) "sef" = ( /obj/structure/railing, /obj/structure/lattice/catwalk, @@ -82138,26 +82265,15 @@ /turf/space, /area/space/nearstation/disposals) "sei" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor{ - density = 0; - icon_state = "open"; - id_tag = "telescienceblast"; - name = "test chamber blast doors"; - opacity = 0 +/obj/structure/chair/sofa/left{ + dir = 4; + color = "#A30FAF" }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/obj/effect/turf_decal/stripes, -/obj/machinery/door/airlock/research/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/science/research, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/area/station/science/hallway) "sej" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -82402,6 +82518,8 @@ /area/station/legal/lawoffice) "sht" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -83175,11 +83293,15 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel/white, @@ -84640,6 +84762,7 @@ id = "rd" }, /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plating, @@ -84659,6 +84782,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -85079,6 +85204,8 @@ /area/station/legal/magistrate) "sOo" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -85425,6 +85552,8 @@ /area/station/medical/surgery/primary) "sSG" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -86568,6 +86697,8 @@ /area/station/engineering/control) "tia" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -87234,6 +87365,20 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/port/north) +"tqQ" = ( +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + 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/plasteel/white, +/area/station/science/xenobiology) "trc" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -87653,6 +87798,7 @@ }, /obj/item/clothing/glasses/science, /obj/structure/cable/orange{ + d2 = 2; icon_state = "0-2" }, /obj/machinery/power/apc/directional/north, @@ -87714,7 +87860,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/circuitboard/destructive_analyzer, +/obj/item/circuitboard/scientific_analyzer, /obj/item/circuitboard/protolathe{ pixel_x = 3; pixel_y = -3 @@ -87745,10 +87891,6 @@ icon_state = "whitepurple" }, /area/station/science/xenobiology) -"twL" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/station/science/explab/chamber) "twS" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, @@ -88075,6 +88217,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/door/firedoor, @@ -88292,6 +88436,8 @@ /area/station/hallway/primary/central/east) "tFf" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden{ @@ -89498,7 +89644,8 @@ dir = 1 }, /turf/simulated/floor/plasteel{ - icon_state = "whitepurplefull" + dir = 10; + icon_state = "whitepurple" }, /area/station/science/hallway) "tVR" = ( @@ -89637,6 +89784,8 @@ /area/station/hallway/primary/aft/west) "tXJ" = ( /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/disposalpipe/segment/corner, @@ -89818,6 +89967,8 @@ /area/station/maintenance/starboard) "tZl" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -90016,6 +90167,8 @@ /area/station/maintenance/apmaint) "uba" = ( /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/disposalpipe/segment/corner{ @@ -90392,6 +90545,7 @@ "ufg" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable/orange{ + d2 = 2; icon_state = "0-2" }, /turf/simulated/floor/plating, @@ -91809,23 +91963,6 @@ icon_state = "white" }, /area/station/medical/medbay) -"uxx" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab/chamber) "uxA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -91841,16 +91978,22 @@ /turf/simulated/floor/plasteel, /area/station/security/main) "uxD" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 + dir = 5 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 + dir = 5 }, -/turf/simulated/floor/plasteel{ - icon_state = "white" +/obj/structure/cable/orange{ + d1 = 1; + d2 = 4; + icon_state = "1-4" }, -/area/station/science/explab/chamber) +/turf/simulated/floor/plasteel/white, +/area/station/science/hallway) "uxF" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -92321,6 +92464,8 @@ /area/station/engineering/control) "uCn" = ( /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel/white, @@ -92716,6 +92861,23 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/engineering/atmos/control) +"uHh" = ( +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/door/window/classic/normal{ + name = "Containment Pen" + }, +/obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio, +/obj/effect/turf_decal/stripes, +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/station/science/xenobiology) "uHl" = ( /obj/effect/spawner/random/dirt/often, /obj/machinery/atmospherics/pipe/simple/visible, @@ -92746,9 +92908,13 @@ /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/autoname, /obj/structure/cable/orange{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/mapping_helpers/airlock/access/all/science/tox, @@ -92924,6 +93090,8 @@ /area/station/public/storefront) "uJx" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -93871,10 +94039,7 @@ /obj/structure/disposalpipe/junction{ dir = 8 }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurplecorner" - }, +/turf/simulated/floor/plasteel/white, /area/station/science/hallway) "uUL" = ( /obj/machinery/light/small{ @@ -93957,6 +94122,8 @@ name = "Aft Asteroid Maintenance" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -94301,6 +94468,8 @@ /area/station/engineering/solar/fore_starboard) "vbY" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -94317,9 +94486,7 @@ /obj/machinery/door/airlock/research/glass{ name = "Xenobiology Research" }, -/turf/simulated/floor/plasteel{ - icon_state = "cafeteria" - }, +/turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "vca" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -94535,6 +94702,7 @@ /area/station/hallway/primary/aft/east) "vey" = ( /obj/structure/cable/orange{ + d2 = 8; icon_state = "0-8" }, /obj/effect/spawner/window/reinforced/grilled, @@ -95784,6 +95952,8 @@ /area/mine/unexplored/cere/command) "vvb" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -95792,6 +95962,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel/white, @@ -97014,13 +97186,16 @@ /turf/simulated/floor/plating, /area/station/maintenance/disposal/southwest) "vKW" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/orange{ + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) +/turf/simulated/floor/plasteel/white, +/area/station/science/hallway) "vLe" = ( /obj/structure/cable/orange{ icon_state = "2-4" @@ -98604,12 +98779,18 @@ /area/station/science/storage) "wig" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable/orange{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -99339,6 +99520,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -100106,6 +100289,12 @@ icon_state = "whiteblue" }, /area/station/medical/paramedic) +"wyo" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple"; + dir = 4 + }, +/area/station/science/hallway) "wyp" = ( /obj/structure/closet/secure_closet/brig, /obj/machinery/camera{ @@ -101398,8 +101587,16 @@ /area/station/supply/storage) "wOi" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; 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/plasteel{ icon_state = "cafeteria" }, @@ -101822,22 +102019,6 @@ icon_state = "rampbottom" }, /area/station/hallway/secondary/exit) -"wTm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable/orange{ - icon_state = "1-2" - }, -/obj/item/radio/intercom{ - pixel_x = 28; - name = "custom placement" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurple" - }, -/area/station/science/explab/chamber) "wTB" = ( /obj/item/mounted/mirror{ icon_state = "mirror_broke"; @@ -103567,10 +103748,6 @@ icon_state = "neutralfull" }, /area/station/hallway/primary/port/north) -"xth" = ( -/obj/effect/landmark/spawner/xeno, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "xtD" = ( /obj/structure/disposalpipe/segment{ dir = 4; @@ -103708,6 +103885,8 @@ /area/station/medical/paramedic) "xvt" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -103741,17 +103920,6 @@ icon_state = "asteroidplating" }, /area/station/maintenance/asmaint) -"xvy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "xvE" = ( /obj/structure/flora/junglebush/large, /turf/simulated/floor/grass, @@ -103797,11 +103965,14 @@ }, /area/station/public/quantum/docking) "xwE" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/structure/table/wood, +/obj/item/megaphone, +/obj/machinery/newscaster{ + pixel_y = 28; + name = "north bump" }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/turf/simulated/floor/wood, +/area/station/command/office/rd) "xwI" = ( /turf/simulated/floor/engine{ slowdown = -0.3 @@ -104474,6 +104645,8 @@ /area/station/hallway/spacebridge/scidock) "xDa" = ( /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -104570,6 +104743,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -105483,6 +105658,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -105560,11 +105737,10 @@ }, /area/station/medical/break_room) "xQJ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/structure/table/wood, +/obj/item/disk/rnd_backup_disk, +/turf/simulated/floor/wood, +/area/station/command/office/rd) "xQK" = ( /obj/structure/cable/orange{ icon_state = "1-2" @@ -105595,6 +105771,22 @@ "xQS" = ( /turf/simulated/wall, /area/station/security/prisonlockers) +"xQU" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/orange{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/turf/simulated/floor/plating{ + icon_state = "asteroidplating" + }, +/area/station/maintenance/apmaint) "xQX" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/red/line, @@ -106654,6 +106846,8 @@ dir = 4 }, /obj/structure/cable/orange{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -106822,6 +107016,25 @@ icon_state = "dark" }, /area/station/security/warden) +"yhz" = ( +/obj/structure/disposalpipe/segment/corner, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/structure/cable/orange{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/structure/closet/walllocker/emerglocker/east, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple"; + dir = 4 + }, +/area/station/science/hallway) "yhA" = ( /obj/structure/cable{ icon_state = "4-8" @@ -107017,6 +107230,8 @@ sort_type_txt = "12" }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -107184,14 +107399,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/starboard) -"ykX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab/chamber) "ylg" = ( /obj/structure/cable/orange{ icon_state = "4-8" @@ -107233,6 +107440,8 @@ dir = 10 }, /obj/structure/cable/orange{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, @@ -124433,7 +124642,7 @@ uzI lil mas sKh -gYw +xQU wIq wIq wIq @@ -124690,7 +124899,7 @@ cuM jvN mas rza -gYw +xQU wsR wsR wIq @@ -125970,7 +126179,7 @@ spk vng mas mas -mas +mRN mas mas mas @@ -126225,8 +126434,8 @@ mSY qtW luB tVO -quI -rUV +mas +rSm cyi rUV pon @@ -126482,9 +126691,9 @@ hJW csL efd gTe -quI +mas xwE -mYx +cyi lfq pon idU @@ -126737,11 +126946,11 @@ sDh qOm lxD iVB -wmq +bkQ csA -quI +mas mJd -xth +mYx gEJ jxt nLk @@ -126994,9 +127203,9 @@ tyK qOm jIr rBW -wmq +bkQ nMt -quI +mas meg sdP xQJ @@ -127253,10 +127462,10 @@ pVi tZl ooj cuV -quI -ipD -sei -ipD +mas +mas +mas +mas pon eru wRF @@ -127265,7 +127474,7 @@ wRF rmR pon rza -dsY +mFs rUU ccW uyl @@ -127509,10 +127718,10 @@ qOm tFm hKm uUF -twL +sYp ctb ctQ -xvy +sei cuQ pon mCc @@ -127522,7 +127731,7 @@ wRF hLg pon aic -dsY +mFs rza alv uyl @@ -127766,8 +127975,8 @@ pzi oRh kvo yjp -iNK -eHo +vKW +vKW vKW uxD fSl @@ -128022,12 +128231,12 @@ cnU bQe sKb vvb -crv -twL -rvL -fHA -oXs -dNJ +bkQ +bkQ +bkQ +bkQ +qMc +fzj uwd fuV ezb @@ -128279,12 +128488,12 @@ wjy cpn htq fvk -wmq -cuV -qBl -ykX -ffL -hYb +crv +wyo +cqF +bkQ +qMc +sYp woF dyp fvB @@ -128537,11 +128746,11 @@ qOm xIa vbY pzF -cuV -nQw -wTm -uxx -cuU +xIa +kAW +saY +yhz +kkM iZy lSP pwx @@ -128794,11 +129003,11 @@ cGd wNA qKO yiP -cuV -cuV -cuV -cuV -cuV +xIa +xIa +xIa +xIa +xIa uwd nOO xAI @@ -129568,7 +129777,7 @@ wAG wAG wAG uCn -vld +hOF ylO lxm vWk @@ -130338,7 +130547,7 @@ hkt gjW wAG wAG -gpF +lBK wAG meZ rSU @@ -130592,13 +130801,13 @@ isf vUX pAi qHL -njH -vld -vld +uHh +hOF +hOF wig -vld -vld -bYh +hOF +hOF +gax iTH pAi pAi @@ -130852,7 +131061,7 @@ lSZ oDZ vMf wAG -jqw +tqQ wAG rPK dko diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 7b7e23b670c..61c3e841c4a 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -1773,9 +1773,6 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry/east) -"any" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) "anz" = ( /obj/item/kirbyplants, /obj/machinery/light/small{ @@ -3980,12 +3977,6 @@ icon_state = "brown" }, /area/station/maintenance/disposal) -"atX" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "atY" = ( /obj/machinery/power/solar{ name = "Aft Starboard Solar Panel" @@ -10533,6 +10524,23 @@ icon_state = "neutral" }, /area/station/maintenance/fore) +"aNa" = ( +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 3 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "aNb" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -10687,6 +10695,12 @@ }, /turf/simulated/floor/plating, /area/station/medical/coldroom) +"aNC" = ( +/obj/structure/rack, +/obj/effect/spawner/random/maintenance, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "aND" = ( /obj/structure/cable{ icon_state = "1-4" @@ -16646,6 +16660,24 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/fore/south) +"bdI" = ( +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "bdJ" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16901,6 +16933,13 @@ /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plasteel, /area/station/supply/miningdock) +"bex" = ( +/obj/machinery/firealarm/directional/south, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/station/science/testrange) "bez" = ( /turf/simulated/floor/plasteel{ icon_state = "neutral" @@ -21881,6 +21920,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/disposalpipe/segment, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -24887,13 +24928,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/gravitygenerator) -"bBq" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "bBr" = ( /obj/structure/cable{ icon_state = "1-8" @@ -26022,7 +26056,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/circuitboard/destructive_analyzer, +/obj/item/circuitboard/scientific_analyzer, /obj/item/circuitboard/protolathe{ pixel_x = 3; pixel_y = -3 @@ -27886,6 +27920,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -28535,12 +28571,6 @@ icon_state = "yellow" }, /area/station/engineering/break_room) -"bKn" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "bKp" = ( /obj/structure/cable{ icon_state = "4-8" @@ -37105,6 +37135,8 @@ /area/station/security/range) "cjD" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -39189,6 +39221,8 @@ /area/station/engineering/equipmentstorage) "cpE" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -44821,6 +44855,8 @@ /area/station/maintenance/port) "cGo" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -44837,6 +44873,8 @@ /area/station/maintenance/port) "cGp" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -44852,6 +44890,8 @@ /area/station/maintenance/port) "cGq" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -44868,6 +44908,8 @@ /area/station/maintenance/port) "cGs" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -44887,6 +44929,8 @@ /area/station/maintenance/port) "cGt" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -44902,27 +44946,10 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/port) -"cGu" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/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 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "cGv" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -45258,6 +45285,8 @@ dir = 5 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel{ @@ -45276,6 +45305,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -45294,6 +45325,8 @@ dir = 2 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -46551,6 +46584,8 @@ dir = 6 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -46819,6 +46854,8 @@ }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -46835,6 +46872,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/grass, @@ -47310,6 +47349,8 @@ /area/station/science/xenobiology) "cOX" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -47334,6 +47375,8 @@ /area/station/science/xenobiology) "cPc" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ @@ -47717,15 +47760,23 @@ /area/station/science/xenobiology) "cQK" = ( /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -47784,6 +47835,8 @@ "cQQ" = ( /obj/machinery/door/firedoor, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -47802,12 +47855,16 @@ /area/station/science/xenobiology) "cQS" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel/white, /area/station/science/xenobiology) "cQV" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ @@ -48097,9 +48154,13 @@ /area/station/science/xenobiology) "cSe" = ( /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -48512,6 +48573,8 @@ "cTE" = ( /obj/machinery/hologram/holopad, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -48959,6 +49022,8 @@ /area/station/science/xenobiology) "cVg" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -48993,6 +49058,8 @@ /area/station/science/xenobiology) "cVn" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/turf_decal/stripes/line{ @@ -49009,6 +49076,7 @@ /obj/item/folder/white, /obj/item/pen, /obj/structure/cable{ + d2 = 8; icon_state = "0-8" }, /obj/effect/turf_decal/stripes/line, @@ -49334,9 +49402,13 @@ /area/station/science/xenobiology) "cWJ" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -49345,6 +49417,8 @@ /area/station/science/xenobiology) "cWK" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel/white, @@ -49381,7 +49455,7 @@ }, /area/station/science/rnd) "cWQ" = ( -/obj/machinery/r_n_d/destructive_analyzer, +/obj/machinery/r_n_d/scientific_analyzer, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -50905,9 +50979,6 @@ "ddh" = ( /turf/simulated/floor/plasteel, /area/station/maintenance/port) -"ddi" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab) "ddj" = ( /obj/structure/table/reinforced, /obj/machinery/firealarm/directional/south, @@ -51662,9 +51733,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/science/xenobiology) -"dgc" = ( -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "dge" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -58838,13 +58906,6 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) -"dRT" = ( -/obj/machinery/power/apc/critical/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "dRZ" = ( /obj/item/clothing/suit/fire/firefighter, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -60318,7 +60379,7 @@ /area/station/command/office/ce) "dZb" = ( /obj/machinery/camera{ - c_tag = "Research Hallway"; + c_tag = "Research Range North"; network = list("Research","SS13") }, /turf/simulated/floor/plasteel{ @@ -60648,6 +60709,10 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/science/xenobiology) +"egq" = ( +/obj/effect/turf_decal/caution/stand_clear, +/turf/simulated/floor/engine, +/area/station/science/testrange) "egF" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/research/glass, @@ -61176,23 +61241,6 @@ }, /turf/simulated/floor/plating/airless, /area/station/engineering/control) -"esH" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/clothing/gloves/color/latex, -/obj/item/clothing/glasses/science{ - pixel_x = -3; - pixel_y = 5 - }, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler{ - pixel_x = 2; - pixel_y = 3 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "etc" = ( /obj/machinery/button/windowtint{ dir = 8; @@ -61245,6 +61293,15 @@ /obj/machinery/atmospherics/portable/canister/nitrogen, /turf/simulated/floor/plasteel, /area/station/science/storage) +"evc" = ( +/obj/effect/turf_decal/stripes/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/station/science/testrange) "evE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -61401,12 +61458,6 @@ icon_state = "neutral" }, /area/station/maintenance/starboard) -"ezU" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "ezV" = ( /obj/machinery/door/airlock/titanium{ id_tag = "s_docking_airlock" @@ -61684,15 +61735,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/primary/central) -"eJp" = ( -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "eJy" = ( /obj/machinery/door/window/classic/reversed{ dir = 4; @@ -61744,6 +61786,12 @@ icon_state = "whiteblue" }, /area/station/medical/sleeper) +"eLu" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) "eLI" = ( /obj/item/kirbyplants, /turf/simulated/floor/plasteel{ @@ -61880,11 +61928,6 @@ icon_state = "barber" }, /area/station/security/permabrig) -"eOd" = ( -/obj/machinery/power/apc/directional/west, -/obj/structure/cable, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "eOg" = ( /obj/structure/table/reinforced, /obj/machinery/atmospherics/unary/vent_pump/on, @@ -62069,10 +62112,6 @@ icon_state = "freezerfloor" }, /area/station/medical/cloning) -"eSc" = ( -/obj/machinery/computer/rdconsole/experiment, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "eSX" = ( /obj/structure/disposalpipe/segment/corner{ dir = 4 @@ -62088,6 +62127,8 @@ /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -62101,14 +62142,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/port) -"eTE" = ( -/obj/effect/spawner/window/reinforced/plasma, -/obj/machinery/door/poddoor/preopen{ - id_tag = "experimentor"; - name = "Experimentor Blast Door" - }, -/turf/simulated/floor/engine, -/area/station/science/explab) "eUn" = ( /obj/structure/cable{ icon_state = "4-8" @@ -62967,13 +63000,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/theatre) -"fvH" = ( -/obj/structure/chair/office/light{ - dir = 1 - }, -/obj/effect/landmark/start/scientist, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "fvJ" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -63069,14 +63095,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) -"fze" = ( -/obj/structure/closet/l3closet/scientist, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "fzp" = ( /obj/structure/chair/stool{ dir = 8 @@ -63107,6 +63125,9 @@ /obj/structure/window/reinforced, /turf/simulated/floor/transparent/glass, /area/station/aisat) +"fBk" = ( +/turf/simulated/wall/r_wall, +/area/station/science/testrange) "fBl" = ( /obj/machinery/power/apc/directional/south, /obj/structure/cable{ @@ -63288,6 +63309,12 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"fFS" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "fFU" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/latex, @@ -63391,6 +63418,23 @@ icon_state = "grimy" }, /area/station/maintenance/starboard) +"fJO" = ( +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "fJR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -63888,9 +63932,13 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -64066,6 +64114,13 @@ }, /turf/simulated/floor/plating, /area/station/engineering/controlroom) +"gdm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 2 + }, +/obj/structure/railing, +/turf/simulated/floor/engine, +/area/station/science/testrange) "gdJ" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -64651,9 +64706,13 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel/dark, @@ -65759,10 +65818,6 @@ icon_state = "darkredcorners" }, /area/station/security/permabrig) -"hig" = ( -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "hiB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -66469,6 +66524,20 @@ }, /turf/space, /area/space) +"hEe" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera{ + c_tag = "Research Break Room"; + dir = 4; + network = list("Research","SS13") + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "hEk" = ( /obj/structure/closet/walllocker/emerglocker/west, /obj/effect/turf_decal/delivery/hollow, @@ -66944,9 +67013,13 @@ name = "Creature Cell #6" }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio{ @@ -67489,6 +67562,7 @@ /area/station/security/permabrig) "ile" = ( /obj/structure/cable{ + d2 = 4; icon_state = "0-4" }, /obj/machinery/atmospherics/pipe/simple/hidden, @@ -67575,14 +67649,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/entry/east) -"inM" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "inO" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /obj/structure/disposalpipe/segment{ @@ -68278,10 +68344,6 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/security/armory/secure) -"iNa" = ( -/obj/item/relic, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "iNf" = ( /obj/structure/bed/roller, /obj/machinery/firealarm/directional/south, @@ -69673,6 +69735,8 @@ /area/station/medical/storage) "jIA" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -69721,11 +69785,6 @@ icon_state = "red" }, /area/station/engineering/atmos) -"jJj" = ( -/obj/structure/rack, -/obj/effect/spawner/random/maintenance, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "jJl" = ( /obj/structure/cable{ icon_state = "0-2" @@ -69948,14 +70007,6 @@ icon_state = "dark" }, /area/station/security/execution) -"jNS" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/port) "jNY" = ( /obj/effect/turf_decal/woodsiding{ dir = 1 @@ -70349,16 +70400,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) -"jZB" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment/corner{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/port) "kaO" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/security/glass, @@ -70807,6 +70848,17 @@ icon_state = "showroomfloor" }, /area/station/medical/surgery) +"knZ" = ( +/obj/structure/closet/bombcloset, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) +"kol" = ( +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "koC" = ( /obj/item/kirbyplants, /obj/machinery/light/small{ @@ -71020,18 +71072,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/hallway/secondary/exit) -"kwv" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "kxj" = ( /obj/structure/mirror{ pixel_y = 28 @@ -71604,6 +71644,15 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/command/office/ce) +"kPB" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/science/xenobiology) "kPJ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/portable/canister/carbon_dioxide, @@ -71966,6 +72015,14 @@ icon_state = "neutralcorner" }, /area/station/maintenance/apmaint) +"lcg" = ( +/obj/structure/cable, +/obj/machinery/power/apc/directional/west, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/station/science/testrange) "lcl" = ( /obj/structure/plasticflaps{ opacity = 1 @@ -72350,15 +72407,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prison/cell_block) -"lpm" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "lpo" = ( /obj/item/radio/intercom{ name = "east bump"; @@ -72571,10 +72619,6 @@ icon_state = "grimy" }, /area/station/maintenance/starboard) -"lus" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/station/science/explab) "luT" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -73152,6 +73196,20 @@ }, /turf/simulated/wall/r_wall, /area/station/engineering/atmos) +"lOU" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/obj/machinery/camera{ + c_tag = "Research Range South"; + network = list("Research","SS13") + }, +/obj/item/storage/toolbox/mechanical, +/obj/item/weldingtool/research, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "lPb" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor{ @@ -73248,12 +73306,6 @@ icon_state = "brown" }, /area/station/hallway/secondary/entry/east) -"lQN" = ( -/obj/machinery/status_display{ - pixel_y = 32 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "lQW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -74128,6 +74180,7 @@ "msD" = ( /obj/item/kirbyplants, /obj/structure/cable{ + d2 = 8; icon_state = "0-4" }, /obj/machinery/power/apc/directional/west, @@ -74798,6 +74851,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/east) +"mQi" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "mQk" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -74934,13 +74996,6 @@ icon_state = "whitepurple" }, /area/station/science/misc_lab) -"mSQ" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/alarm/directional/north, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "mSV" = ( /obj/machinery/door/poddoor{ density = 0; @@ -75401,6 +75456,7 @@ /area/station/hallway/primary/aft/south) "nff" = ( /obj/structure/cable{ + d2 = 8; icon_state = "0-8" }, /obj/effect/spawner/window/reinforced/grilled, @@ -75502,6 +75558,20 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) +"nhw" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurplecorner" + }, +/area/station/science/testrange) "nhy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -75997,6 +76067,18 @@ icon_state = "whiteblue" }, /area/station/medical/surgery/secondary) +"ntF" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "ntG" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4 @@ -76047,14 +76129,6 @@ }, /turf/simulated/floor/wood, /area/station/maintenance/library) -"nvb" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "nvc" = ( /obj/structure/closet/secure_closet/hos, /obj/effect/turf_decal/stripes/line{ @@ -76413,6 +76487,16 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/permabrig) +"nFq" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/port) "nFv" = ( /obj/machinery/light, /turf/simulated/floor/plasteel{ @@ -76538,6 +76622,12 @@ icon_state = "vault" }, /area/station/command/office/hos) +"nJR" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "nKa" = ( /obj/structure/cable{ icon_state = "2-4" @@ -76966,6 +77056,15 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/virology) +"nZY" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/science/xenobiology) "oar" = ( /obj/machinery/requests_console/directional/south, /turf/simulated/floor/plasteel{ @@ -76996,6 +77095,20 @@ icon_state = "neutral" }, /area/station/maintenance/starboard) +"obU" = ( +/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/white, +/area/station/science/xenobiology) "ocj" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, @@ -77062,16 +77175,6 @@ /obj/effect/spawner/window/reinforced/plasma/grilled, /turf/simulated/floor/plating, /area/station/engineering/atmos) -"odU" = ( -/obj/machinery/newscaster{ - name = "west bump"; - pixel_x = -32 - }, -/obj/machinery/firealarm/directional/south, -/obj/structure/closet/bombcloset, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "odY" = ( /obj/machinery/camera{ c_tag = "Aft Starboard Solars" @@ -77126,25 +77229,6 @@ icon_state = "red" }, /area/station/security/permabrig) -"ogX" = ( -/obj/machinery/camera{ - c_tag = "Experimentation Lab Office"; - dir = 9; - network = list("Research","SS13") - }, -/obj/structure/table/reinforced, -/obj/item/clipboard, -/obj/item/paper_bin{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/pen, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "ohf" = ( /obj/structure/lattice/catwalk, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -77261,6 +77345,22 @@ icon_state = "neutral" }, /area/station/maintenance/fsmaint) +"okZ" = ( +/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{ + icon_state = "whitepurplefull" + }, +/area/station/science/xenobiology) "oll" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -77750,6 +77850,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/port) +"oyv" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "oyz" = ( /obj/structure/cable{ icon_state = "0-4" @@ -78137,9 +78243,13 @@ name = "Creature Cell #3" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio, @@ -78553,13 +78663,6 @@ "oUR" = ( /turf/simulated/wall, /area/station/aisat) -"oVd" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel, -/area/station/maintenance/port) "oVl" = ( /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, @@ -78780,9 +78883,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/command/office/captain/bedroom) -"paJ" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "paO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 8 @@ -78826,6 +78926,14 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) +"pbU" = ( +/obj/structure/cable{ + d2 = 4; + icon_state = "0-4" + }, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/science/xenobiology) "pcc" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/window/reinforced/grilled, @@ -78919,12 +79027,6 @@ icon_state = "neutral" }, /area/station/maintenance/port) -"peG" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "pfg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -79214,6 +79316,28 @@ icon_state = "whitebluecorner" }, /area/station/medical/medbay) +"ppC" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio, +/obj/machinery/door/window/classic/normal{ + name = "Containment Pen" + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/xenobiology) +"ppI" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/station/science/testrange) "pqM" = ( /obj/machinery/power/apc/directional/west, /obj/structure/cable{ @@ -79317,6 +79441,20 @@ }, /turf/simulated/floor/wood, /area/station/command/meeting_room) +"ptQ" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Science Maintenance" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "pup" = ( /obj/machinery/atmospherics/portable/canister/oxygen, /turf/simulated/floor/plasteel, @@ -79355,10 +79493,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/warden) -"pvo" = ( -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/plasteel, -/area/station/maintenance/port) "pvv" = ( /obj/machinery/recharger/wallcharger{ pixel_y = 25 @@ -79433,6 +79567,19 @@ }, /turf/simulated/floor/plating, /area/station/security/storage) +"pxi" = ( +/obj/structure/rack, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/newscaster{ + name = "north bump"; + pixel_y = 28 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "pxj" = ( /obj/machinery/atmospherics/portable/scrubber/huge/stationary, /turf/simulated/floor/plasteel{ @@ -79914,10 +80061,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/expedition) -"pLs" = ( -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "pLz" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -80194,23 +80337,13 @@ /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/science/research, /turf/simulated/floor/plasteel/white, -/area/station/science/explab) +/area/station/science/testrange) "pTR" = ( /turf/simulated/floor/plasteel{ dir = 4; icon_state = "darkred" }, /area/station/security/prison/cell_block) -"pTZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "pUw" = ( /obj/structure/chair/comfy/beige{ dir = 4 @@ -80302,14 +80435,6 @@ /obj/machinery/economy/vending/cigarette, /turf/simulated/floor/plasteel, /area/station/public/toilet/lockerroom) -"pWq" = ( -/obj/structure/closet/emcloset, -/obj/structure/disposalpipe/segment/corner{ - dir = 2 - }, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "pWt" = ( /obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/crate, @@ -81360,6 +81485,19 @@ /obj/structure/barricade/wooden, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"qJw" = ( +/obj/structure/table/reinforced, +/obj/item/clothing/glasses/science{ + pixel_x = 2; + pixel_y = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/alarm/directional/east, +/obj/item/folder, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "qJA" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 4 @@ -81590,13 +81728,6 @@ }, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) -"qRH" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "qRW" = ( /obj/structure/closet/secure_closet/personal/patient, /obj/structure/cable{ @@ -82561,15 +82692,6 @@ icon_state = "neutral" }, /area/station/hallway/secondary/entry/lounge) -"rps" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "rpN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -82581,11 +82703,6 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/fore) -"rpQ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "rpX" = ( /obj/machinery/door/poddoor{ density = 0; @@ -82755,6 +82872,15 @@ icon_state = "neutralfull" }, /area/station/hallway/secondary/exit) +"rvY" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "rwD" = ( /obj/machinery/door/airlock/command/glass{ name = "Head of Personnel Bedroom" @@ -82765,6 +82891,12 @@ }, /turf/simulated/floor/wood, /area/station/command/office/hop) +"rwE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "rwF" = ( /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -82859,9 +82991,13 @@ sort_type_txt = "15" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel{ @@ -83037,6 +83173,29 @@ }, /turf/simulated/floor/plating/airless, /area/station/medical/virology) +"rEr" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "rEs" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -83057,6 +83216,9 @@ /obj/structure/weightmachine/weightlifter, /turf/simulated/floor/plasteel, /area/station/public/fitness) +"rGF" = ( +/turf/simulated/floor/engine, +/area/station/science/testrange) "rGZ" = ( /obj/machinery/power/apc/directional/west, /obj/structure/cable{ @@ -83246,10 +83408,17 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) -"rLK" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +"rLQ" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "rMm" = ( /obj/machinery/power/apc/directional/west, /obj/structure/cable{ @@ -83660,12 +83829,6 @@ icon_state = "darkredfull" }, /area/station/security/prison/cell_block) -"rXW" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "rYa" = ( /mob/living/carbon/human/monkey, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -84249,19 +84412,6 @@ icon_state = "redyellowfull" }, /area/station/medical/break_room) -"sls" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/preopen{ - id_tag = "experimentor"; - name = "Experimentor Blast Door" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "slB" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -84274,17 +84424,6 @@ /obj/effect/decal/cleanable/blood/oil, /turf/simulated/floor/plating, /area/station/maintenance/port) -"slJ" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Science Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "slN" = ( /obj/structure/table/wood, /obj/machinery/light{ @@ -84744,6 +84883,17 @@ icon_state = "whiteblue" }, /area/station/medical/surgery/observation) +"swS" = ( +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "swV" = ( /obj/machinery/hydroponics/constructable, /obj/item/seeds/glowshroom, @@ -84775,6 +84925,23 @@ icon_state = "darkred" }, /area/station/security/prison/cell_block) +"sxb" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplecorner" + }, +/area/station/hallway/primary/central/south) "syt" = ( /obj/structure/disposalpipe/segment/corner{ dir = 1 @@ -85651,6 +85818,11 @@ icon_state = "redcorner" }, /area/station/hallway/primary/starboard/east) +"sUQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "sUV" = ( /obj/machinery/camera{ c_tag = "Central Ring Hallway South" @@ -85893,6 +86065,21 @@ icon_state = "yellow" }, /area/station/engineering/break_room) +"taE" = ( +/obj/effect/turf_decal/loading_area/red{ + dir = 1 + }, +/obj/effect/turf_decal/box/red/corners{ + dir = 4 + }, +/obj/effect/turf_decal/box/red/corners{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 5; + icon_state = "whitepurple" + }, +/area/station/science/testrange) "tbn" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 @@ -86052,6 +86239,18 @@ "thL" = ( /turf/simulated/floor/wood, /area/station/maintenance/library) +"tik" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "neutralfull" + }, +/area/station/maintenance/port) "tiC" = ( /obj/machinery/atmospherics/binary/pump{ dir = 4; @@ -86440,6 +86639,9 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/ai_monitored/storage/eva) +"twU" = ( +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "twX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -86458,14 +86660,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/west) -"txR" = ( -/obj/machinery/camera{ - c_tag = "Experimention Lab"; - network = list("Experimentator","Research","SS13") - }, -/obj/machinery/firealarm/directional/north, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "txW" = ( /obj/machinery/newscaster{ dir = 1; @@ -86626,14 +86820,6 @@ "tDw" = ( /turf/simulated/wall, /area/station/medical/reception) -"tDE" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "tDQ" = ( /obj/machinery/alarm/directional/north, /obj/machinery/chem_master/condimaster, @@ -86939,6 +87125,22 @@ /obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, /turf/simulated/floor/plasteel/white, /area/station/medical/medbay) +"tKJ" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/turf_decal/delivery, +/obj/effect/mapping_helpers/airlock/windoor/access/any/science/xenobio{ + dir = 1 + }, +/obj/machinery/door/window/classic/reversed{ + dir = 1; + name = "Containment Pen" + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/xenobiology) "tKX" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -87244,20 +87446,6 @@ icon_state = "cult" }, /area/station/service/chapel/office) -"tUS" = ( -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/sop_science, -/obj/item/book/manual/wiki/experimentor{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/light_switch{ - dir = 8; - name = "east bump"; - pixel_x = 24 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "tVa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 8 @@ -87586,6 +87774,7 @@ /area/station/engineering/smes) "udg" = ( /obj/structure/cable{ + d2 = 4; icon_state = "0-4" }, /obj/effect/spawner/window/reinforced/grilled, @@ -87966,6 +88155,21 @@ /obj/item/clothing/glasses/meson/engine, /turf/simulated/floor/engine, /area/station/engineering/controlroom) +"ulf" = ( +/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 + }, +/obj/effect/turf_decal/delivery, +/turf/simulated/floor/plasteel/white, +/area/station/science/xenobiology) "ulH" = ( /obj/structure/chair{ dir = 8 @@ -88296,6 +88500,12 @@ icon_state = "whitebluefull" }, /area/station/maintenance/starboard) +"uxc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "uxq" = ( /mob/living/carbon/human/monkey, /obj/structure/window/reinforced{ @@ -88348,18 +88558,6 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/security/permabrig) -"uzX" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera{ - c_tag = "Research Break Room"; - dir = 4; - network = list("Research","SS13") - }, -/turf/simulated/floor/plasteel, -/area/station/maintenance/port) "uAP" = ( /obj/structure/chair/office/dark{ dir = 4 @@ -88622,6 +88820,10 @@ /obj/machinery/economy/vending/suitdispenser, /turf/simulated/floor/plasteel/dark, /area/station/public/locker) +"uHI" = ( +/obj/structure/target_stake, +/turf/simulated/floor/engine, +/area/station/science/testrange) "uHV" = ( /turf/simulated/floor/plasteel{ icon_state = "neutralfull" @@ -88749,6 +88951,15 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) +"uLd" = ( +/obj/machinery/hologram/holopad, +/obj/effect/turf_decal/delivery/hollow, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "uLr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -89647,10 +89858,6 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) -"vpS" = ( -/obj/effect/landmark/spawner/rev, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "vqu" = ( /obj/effect/landmark/start/coroner, /turf/simulated/floor/plasteel/dark, @@ -89706,6 +89913,21 @@ icon_state = "brown" }, /area/station/hallway/secondary/entry/east) +"vti" = ( +/obj/effect/turf_decal/loading_area/red{ + dir = 1 + }, +/obj/effect/turf_decal/box/red/corners{ + dir = 4 + }, +/obj/effect/turf_decal/box/red/corners{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurple" + }, +/area/station/science/testrange) "vtp" = ( /obj/structure/sign/electricshock{ pixel_y = -32 @@ -89805,18 +90027,22 @@ }, /turf/simulated/floor/carpet/red, /area/station/command/office/hos) -"vyl" = ( -/obj/machinery/door_control{ - id = "experimentor"; - name = "Experimentor Control"; - pixel_y = 25 +"vyp" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/table/reinforced, -/obj/item/storage/toolbox/mechanical, -/obj/item/wrench, -/obj/item/weldingtool/research, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/door/window/classic/normal{ + name = "windoor"; + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 9; + icon_state = "whitepurple" + }, +/area/station/science/testrange) "vys" = ( /obj/effect/spawner/random/maintenance, /obj/effect/spawner/random/storage, @@ -89993,15 +90219,6 @@ }, /turf/simulated/floor/plasteel, /area/station/supply/sorting) -"vCy" = ( -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "vCE" = ( /obj/machinery/economy/vending/snack, /turf/simulated/floor/plasteel{ @@ -90044,6 +90261,12 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plasteel, /area/station/maintenance/fsmaint) +"vDT" = ( +/obj/structure/table/reinforced, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "vDY" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -90674,6 +90897,16 @@ icon_state = "whitegreen" }, /area/station/medical/virology) +"vVZ" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "vWI" = ( /obj/structure/closet/secure_closet/reagents, /obj/effect/turf_decal/stripes/line{ @@ -90772,6 +91005,14 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) +"vZV" = ( +/obj/structure/cable{ + d2 = 8; + icon_state = "0-8" + }, +/obj/effect/spawner/window/reinforced/grilled, +/turf/simulated/floor/plating, +/area/station/science/xenobiology) "wai" = ( /obj/structure/cable{ icon_state = "0-2" @@ -90918,10 +91159,6 @@ /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/engine, /area/station/engineering/controlroom) -"wew" = ( -/obj/machinery/alarm/directional/south, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "weF" = ( /obj/structure/table/reinforced, /obj/item/book/manual/wiki/security_space_law{ @@ -90995,6 +91232,10 @@ icon_state = "darkred" }, /area/station/security/brig) +"wfv" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/station/science/testrange) "wgg" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -91291,14 +91532,6 @@ icon_state = "whiteblue" }, /area/station/medical/sleeper) -"woT" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - icon_state = "1-2" - }, -/mob/living/simple_animal/pet/dog/pug, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "wpr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -91370,6 +91603,16 @@ }, /turf/simulated/floor/plasteel/dark, /area/station/medical/surgery/observation) +"wqP" = ( +/obj/item/radio/intercom{ + name = "east bump"; + pixel_x = 28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple"; + dir = 4 + }, +/area/station/science/testrange) "wre" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -91668,6 +91911,19 @@ icon_state = "vault" }, /area/station/command/bridge) +"wyL" = ( +/obj/structure/closet/firecloset, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/light_switch{ + dir = 4; + name = "west bump"; + pixel_x = -24; + pixel_y = 5 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "wyS" = ( /obj/item/kirbyplants, /obj/structure/cable, @@ -91981,6 +92237,12 @@ icon_state = "dark" }, /area/station/maintenance/apmaint) +"wKx" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 8 + }, +/turf/simulated/floor/plasteel/white, +/area/station/science/testrange) "wKG" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 1 @@ -92307,6 +92569,8 @@ }, /obj/effect/turf_decal/delivery, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -92471,13 +92735,6 @@ }, /turf/simulated/floor/plating, /area/station/medical/coldroom) -"xab" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/port) "xag" = ( /obj/machinery/light, /turf/simulated/floor/plating, @@ -92591,6 +92848,15 @@ /obj/effect/mapping_helpers/turfs/rust/maybe, /turf/simulated/wall, /area/station/maintenance/library) +"xdl" = ( +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, +/area/station/science/testrange) "xdN" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -92692,11 +92958,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/prisonershuttle) -"xhj" = ( -/obj/structure/closet/firecloset, -/obj/effect/turf_decal/delivery/hollow, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "xhy" = ( /obj/structure/target_stake, /obj/structure/cable{ @@ -92709,6 +92970,16 @@ /obj/machinery/magnetic_module, /turf/simulated/floor/plasteel, /area/station/security/range) +"xhB" = ( +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 5 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "xib" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Cloning" @@ -92761,6 +93032,16 @@ icon_state = "darkblue" }, /area/station/command/office/cmo) +"xjh" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plating, +/area/station/maintenance/port) "xjD" = ( /obj/machinery/door/airlock/medical/glass, /obj/effect/mapping_helpers/airlock/access/all/medical/paramedic, @@ -92831,6 +93112,8 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -92998,6 +93281,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -93014,6 +93299,20 @@ icon_state = "seadeep" }, /area/station/public/fitness) +"xrP" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "neutralcorner" + }, +/area/station/hallway/primary/central/sw) "xrW" = ( /obj/structure/cable{ icon_state = "2-8" @@ -93905,17 +94204,6 @@ /obj/effect/mapping_helpers/turfs/rust, /turf/simulated/wall, /area/station/maintenance/abandonedbar) -"xPG" = ( -/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/item/kirbyplants, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "xPQ" = ( /obj/machinery/economy/vending/coffee, /obj/structure/disposalpipe/segment{ @@ -93984,6 +94272,12 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/fore) +"xRx" = ( +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple"; + dir = 4 + }, +/area/station/science/testrange) "xRD" = ( /obj/effect/spawner/random/cobweb/right/frequent, /obj/structure/closet/firecloset, @@ -94011,12 +94305,6 @@ icon_state = "darkgreen" }, /area/station/medical/virology) -"xRX" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel/white, -/area/station/science/explab) "xSf" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -94136,16 +94424,6 @@ }, /turf/simulated/floor/engine, /area/station/engineering/controlroom) -"xXi" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/plasteel{ - icon_state = "neutralfull" - }, -/area/station/maintenance/port) "xXt" = ( /obj/machinery/chem_dispenser, /obj/structure/reagent_dispensers/fueltank/chem{ @@ -94498,6 +94776,13 @@ "ykJ" = ( /turf/simulated/floor/plasteel/white, /area/station/science/break_room) +"ylC" = ( +/obj/machinery/camera{ + c_tag = "Research Hallway"; + network = list("Research","SS13") + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) (1,1,1) = {" aaa @@ -125238,7 +125523,7 @@ cIL cIL cOW cQO -cRX +okZ cTz cOT cIL @@ -125487,18 +125772,18 @@ bZK bYj dhG dlM -cGe +fJO dmq cIM cIM cIM -fxC +pbU cOR cQP -cSd +obU cTz dWp -vgp +nZY cYi cIM cIM @@ -125744,17 +126029,17 @@ cAT bYj czF drn -cGi +bdI dmq cSq cKn cIM hVt -miQ +ppC cPc cQK cQV -eNk +tKJ oJR cIM cKo @@ -126001,18 +126286,18 @@ ctH bYj drn drn -cGi +bdI dmq cIM cIM cLR -jVR +kPB cQI cWA -cTu +ulf cWA cTH -tjH +vZV cIM cIM cIM @@ -126258,7 +126543,7 @@ cAU bYj drn drs -cGi +bdI dmq cIL cIL @@ -126515,7 +126800,7 @@ cAV bYj drn dlM -cGi +bdI dmq eGq eGq @@ -126780,7 +127065,7 @@ xEz ile cOV cWI -cSd +obU cTD cVf cWI @@ -127286,12 +127571,12 @@ cAY bYj drn dlM -cGe +fJO dmq eGq exC mek -tjH +vZV cQP cVf cVf @@ -127543,7 +127828,7 @@ uCq bYj dhG drn -cGi +bdI dmq eGq rkt @@ -128065,12 +128350,12 @@ dmq dmq dmq dmq -ddi -ddi -ddi -ddi -ddi -ddi +fBk +fBk +fBk +fBk +fBk +fBk dau yid cPn @@ -128318,16 +128603,16 @@ cGt ePr oUJ drn -jZB -xab -jNS -uzX -slJ -kwv -rps -eOd -odU -ddi +ntF +rvY +nFq +hEe +ptQ +swS +nhw +lcg +wyL +fBk dau hZN jtD @@ -128571,20 +128856,20 @@ cHr drn drn dhG -cGu -xXi -inM -oVd -eJp -pvo -peG -jJj -ddi -pWq -qRH -hig -fze -lus +rEr +tik +xjh +mQi +rLQ +kol +drn +dhG +fBk +vVZ +twU +nJR +knZ +wfv dau msl cSt @@ -128831,17 +129116,17 @@ cJO cGv drn cIS -any -any -any -any -any -ddi -vyl -xRX -atX -bBq -ddi +dhG +dhG +drn +fFS +aNC +fBk +lOU +twU +wKx +bex +fBk oOW uFN jji @@ -129088,16 +129373,16 @@ cHA eTB cHA cHA -any -dRT -lpm -woT -pTZ -sls -nvb -tDE -vCy -rpQ +fBk +fBk +fBk +fBk +fBk +fBk +pxi +rwE +uLd +sUQ pTN ctm sFm @@ -129340,22 +129625,22 @@ jVv bsf bsf shP -bsf +xrP bst rxU cHB bvV -any -mSQ -rXW -rLK -ezU -eTE -xPG -pLs -bKn -wew -ddi +fBk +rGF +rGF +egq +vyp +ppI +evc +uxc +twU +xdl +fBk dau yid cPn @@ -129602,17 +129887,17 @@ cDd cGy xqH ddm -any -txR -vpS -paJ -paJ -eTE -eSc -fvH -dgc -dgc -lus +fBk +rGF +uHI +gdm +vti +twU +twU +oyv +twU +xhB +wfv dau yid cPn @@ -129859,17 +130144,17 @@ wlC btE cHC ddn -any -lQN -paJ -iNa -paJ -eTE -tUS -ogX -esH -xhj -ddi +fBk +ylC +eLu +gdm +taE +xRx +wqP +aNa +qJw +vDT +fBk dau yid cPn @@ -130116,17 +130401,17 @@ cFp tIa wWa cIV -any -any -any -any -any -ddi -ddi -ddi -ddi -ddi -ddi +fBk +fBk +fBk +fBk +fBk +fBk +fBk +fBk +fBk +fBk +fBk dtS yid cPn @@ -131142,7 +131427,7 @@ cEr cEQ cIT ckv -cHG +sxb cJa rAk cKD @@ -131399,7 +131684,7 @@ cEr cEQ cIT ckv -cHG +sxb cIW lLY cKT diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index 330a7665a40..388e8630d77 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -527,6 +527,8 @@ /area/station/maintenance/asmaint) "ahu" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -2753,14 +2755,6 @@ "aDx" = ( /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) -"aDy" = ( -/obj/item/kirbyplants, -/obj/machinery/alarm/directional/north, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "aDA" = ( /obj/structure/closet/firecloset, /obj/effect/turf_decal/stripes/line{ @@ -3087,6 +3081,8 @@ name = "Science Maintenance" }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -3104,6 +3100,25 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) +"aHh" = ( +/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 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/research) "aHx" = ( /obj/machinery/keycard_auth{ pixel_x = 24 @@ -3453,6 +3468,10 @@ }, /turf/simulated/floor/plating, /area/station/science/xenobiology) +"aLg" = ( +/obj/effect/spawner/window/reinforced, +/turf/simulated/floor/plating, +/area/station/science/testrange) "aLk" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -3646,22 +3665,6 @@ /obj/structure/flora/ash/rock/style_random, /turf/simulated/floor/plating/asteroid/ancient/airless, /area/station/engineering/atmos/asteroid) -"aNj" = ( -/obj/item/paper_bin{ - pixel_x = 1; - pixel_y = 9 - }, -/obj/item/pen, -/obj/item/clothing/glasses/science{ - pixel_y = 5; - pixel_x = -3 - }, -/obj/structure/table/reinforced, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "aNm" = ( /obj/machinery/light/small{ dir = 4; @@ -6493,6 +6496,8 @@ "bpp" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan, @@ -7727,6 +7732,11 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/engine, /area/station/engineering/engine) +"bAu" = ( +/turf/simulated/floor/plasteel{ + icon_state = "purple" + }, +/area/station/science/testrange) "bAx" = ( /obj/structure/cable{ icon_state = "4-8" @@ -8314,6 +8324,14 @@ icon_state = "bluecorner" }, /area/station/hallway/primary/starboard/south) +"bFO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple" + }, +/area/station/science/testrange) "bFP" = ( /obj/machinery/light_switch{ dir = 8; @@ -10506,6 +10524,7 @@ id = "rd" }, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /turf/simulated/floor/plating, @@ -12919,6 +12938,8 @@ /area/station/command/office/ce) "cAv" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -14444,6 +14465,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/oil/maybe, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -16179,6 +16202,12 @@ }, /turf/simulated/wall/r_wall, /area/station/engineering/engine/supermatter) +"dkd" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "dkm" = ( /obj/structure/cable{ icon_state = "4-8" @@ -16992,6 +17021,8 @@ "dso" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -17137,6 +17168,19 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft2) +"dtb" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "dtd" = ( /obj/machinery/washing_machine, /turf/simulated/floor/plasteel{ @@ -17243,6 +17287,16 @@ }, /turf/simulated/floor/plating, /area/station/aisat/hall) +"dtY" = ( +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "duf" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18632,6 +18686,19 @@ icon_state = "dark" }, /area/station/security/prison/cell_block) +"dId" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "white" + }, +/area/station/science/research) "dIj" = ( /obj/structure/sign/securearea, /turf/simulated/wall/r_wall, @@ -18796,11 +18863,6 @@ "dKf" = ( /turf/simulated/wall, /area/station/command/office/captain) -"dKi" = ( -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "dKo" = ( /obj/structure/table, /obj/item/wrench, @@ -19449,21 +19511,6 @@ icon_state = "whitepurple" }, /area/station/science/robotics) -"dRo" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "dRp" = ( /turf/simulated/floor/plasteel{ icon_state = "darkgrey" @@ -19689,6 +19736,12 @@ /obj/effect/mapping_helpers/airlock/access/all/science/minisat, /turf/simulated/floor/plating, /area/station/engineering/ai_transit_tube) +"dUm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) "dUt" = ( /obj/structure/closet/coffin, /obj/machinery/door/window/classic/normal{ @@ -20208,6 +20261,8 @@ "eaQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -21050,6 +21105,8 @@ "ejV" = ( /obj/effect/spawner/random/barrier/obstruction, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -21681,6 +21738,8 @@ "eqw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -24144,6 +24203,8 @@ /area/station/security/brig) "ePo" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -24682,6 +24743,17 @@ }, /turf/simulated/floor/noslip, /area/station/medical/cryo) +"eVE" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "eVL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -25201,19 +25273,6 @@ }, /turf/simulated/floor/plating, /area/station/science/xenobiology) -"eZR" = ( -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/door/firedoor, -/turf/simulated/floor/engine, -/area/station/science/explab) "eZS" = ( /obj/structure/table/wood, /obj/item/paper_bin/nanotrasen, @@ -27525,14 +27584,6 @@ icon_state = "redcorner" }, /area/station/security/processing) -"fuE" = ( -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/obj/machinery/door/firedoor, -/turf/simulated/floor/engine, -/area/station/science/explab) "fuF" = ( /obj/structure/rack, /obj/item/clothing/suit/straight_jacket, @@ -28190,18 +28241,14 @@ }, /area/station/engineering/engine) "fCc" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/sop_science{ - pixel_y = 3; - pixel_x = -3 - }, -/obj/item/book/manual/wiki/experimentor, -/obj/machinery/requests_console/directional/east, +/obj/structure/closet/firecloset, +/obj/machinery/firealarm/directional/east, +/obj/machinery/alarm/directional/north, /turf/simulated/floor/plasteel{ dir = 5; - icon_state = "whitepurple" + icon_state = "purple" }, -/area/station/science/explab) +/area/station/science/testrange) "fCk" = ( /obj/structure/table/reinforced, /obj/item/storage/belt/utility, @@ -28535,6 +28582,12 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/simulated/floor/grass, /area/station/medical/reception) +"fFQ" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "fFT" = ( /obj/effect/spawner/random/oil/maybe, /turf/simulated/floor/plating, @@ -29610,6 +29663,19 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry) +"fPk" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "fPl" = ( /obj/structure/disposalpipe/junction/y, /turf/simulated/floor/plasteel{ @@ -30450,6 +30516,8 @@ /area/station/hallway/secondary/exit) "fZU" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -31707,6 +31775,8 @@ /area/station/maintenance/fpmaint) "gkT" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -31722,6 +31792,23 @@ /obj/item/poster/random_contraband, /turf/simulated/floor/plasteel, /area/station/maintenance/apmaint) +"gkZ" = ( +/obj/structure/table, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 3 + }, +/obj/machinery/light{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 4 + }, +/area/station/science/testrange) "gli" = ( /obj/machinery/economy/vending/cart, /obj/item/toy/figure/crew/ian{ @@ -32757,6 +32844,7 @@ "gwP" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plasteel{ @@ -33904,6 +33992,8 @@ /area/station/science/break_room) "gIp" = ( /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -35684,6 +35774,7 @@ id = "rd" }, /obj/structure/cable{ + d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plating, @@ -35727,6 +35818,8 @@ "hbO" = ( /obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -36715,6 +36808,8 @@ /area/station/science/robotics) "hkT" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -39163,6 +39258,8 @@ /area/station/engineering/atmos) "hIq" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -39193,20 +39290,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) -"hIL" = ( -/obj/structure/cable{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "hIT" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -39500,6 +39583,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel, @@ -40015,6 +40100,8 @@ "hTw" = ( /obj/effect/landmark/start/scientist, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -40384,20 +40471,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_port) -"hXf" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment/corner{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - dir = 4; - icon_state = "whitepurplecorner" - }, -/area/station/science/research) "hXr" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/blood/tracks, @@ -40668,6 +40741,8 @@ /area/station/maintenance/security/fore) "iaw" = ( /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -41086,21 +41161,6 @@ icon_state = "neutralcorner" }, /area/station/public/dorms) -"ieP" = ( -/obj/machinery/door/airlock/research, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/autoname, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "ieS" = ( /obj/structure/table, /obj/effect/spawner/random/cobweb/right/rare, @@ -41515,14 +41575,6 @@ icon_state = "purple" }, /area/station/maintenance/asmaint) -"iic" = ( -/obj/structure/closet/bombcloset, -/obj/machinery/firealarm/directional/west, -/turf/simulated/floor/plasteel{ - dir = 10; - icon_state = "whitepurple" - }, -/area/station/science/explab) "iij" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -42390,6 +42442,8 @@ "isl" = ( /obj/machinery/door/airlock/research/glass, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -43152,6 +43206,21 @@ /obj/structure/closet/emcloset, /turf/simulated/floor/plating, /area/station/maintenance/storage) +"izz" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable{ + d1 = 1; + d2 = 8; + icon_state = "1-8" + }, +/obj/machinery/light/small{ + dir = 4 + }, +/obj/structure/disposalpipe/segment/corner{ + dir = 8 + }, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard) "izA" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -43376,6 +43445,8 @@ /area/station/maintenance/solar_maintenance/fore_starboard) "iBG" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -43432,6 +43503,9 @@ /obj/machinery/alarm/directional/east, /turf/simulated/floor/plasteel, /area/station/ai_monitored/storage/eva) +"iCi" = ( +/turf/simulated/wall, +/area/station/science/testrange) "iCw" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/classic/reversed{ @@ -44037,6 +44111,8 @@ "iHQ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -44201,6 +44277,10 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/engineering/atmos/transit) +"iJx" = ( +/obj/effect/turf_decal/stripes/line, +/turf/simulated/floor/engine, +/area/station/science/testrange) "iJE" = ( /obj/structure/railing{ dir = 1 @@ -45002,6 +45082,24 @@ icon_state = "red" }, /area/station/security/prison/cell_block) +"iRp" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/disposalpipe/junction/reversed{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "iRx" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/plasteel{ @@ -45175,6 +45273,8 @@ /obj/structure/grille/broken, /obj/item/stack/rods, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -47754,23 +47854,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"jub" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 6 - }, -/obj/machinery/door_control{ - id = "telescienceblast"; - name = "Test Chamber Blast Door Control"; - pixel_y = 30; - pixel_x = 7 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "jud" = ( /obj/structure/cable{ icon_state = "1-2" @@ -48788,9 +48871,13 @@ /area/station/maintenance/fsmaint) "jDY" = ( /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -48850,11 +48937,15 @@ name = "Research Director's Office" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, @@ -52530,10 +52621,6 @@ icon_state = "brown" }, /area/station/supply/expedition) -"kqh" = ( -/obj/effect/spawner/window/reinforced, -/turf/simulated/floor/plating, -/area/station/science/explab) "kqp" = ( /obj/structure/cable{ icon_state = "1-2" @@ -52874,6 +52961,8 @@ /area/station/medical/virology/lab) "kto" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -52894,6 +52983,8 @@ "ktr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -54716,6 +54807,8 @@ "kMZ" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -55193,6 +55286,16 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/wood, /area/station/maintenance/abandoned_office) +"kRj" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 6 + }, +/area/station/science/testrange) "kRm" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/structure/sign/poster/official/random{ @@ -55506,6 +55609,16 @@ icon_state = "neutralfull" }, /area/station/hallway/secondary/exit) +"kVd" = ( +/obj/machinery/power/apc/directional/north, +/obj/structure/cable{ + icon_state = "0-8" + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purple" + }, +/area/station/science/testrange) "kVq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, @@ -56621,17 +56734,6 @@ }, /turf/simulated/floor/carpet, /area/station/command/office/hos) -"lim" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/item/radio/intercom{ - name = "east bump"; - pixel_x = 28 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "liq" = ( /obj/machinery/atmospherics/pipe/simple/visible{ dir = 9 @@ -57219,9 +57321,6 @@ icon_state = "dark" }, /area/station/engineering/transmission_laser) -"loN" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) "loP" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -58112,19 +58211,6 @@ /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel, /area/station/command/teleporter) -"lws" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "lwv" = ( /obj/machinery/atmospherics/portable/pump, /turf/simulated/floor/plating, @@ -58600,12 +58686,6 @@ /obj/effect/landmark/spawner/late/crew, /turf/simulated/floor/mineral/titanium/blue, /area/shuttle/arrival/station) -"lAP" = ( -/obj/structure/closet/radiation, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "lBb" = ( /obj/machinery/atmospherics/pipe/simple/hidden{ dir = 4 @@ -59741,6 +59821,8 @@ /area/station/maintenance/security/aft_port) "lNX" = ( /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -59897,6 +59979,8 @@ dir = 10 }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/disposalpipe/segment/corner{ @@ -60879,10 +60963,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) -"mbi" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "mbj" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -60907,6 +60987,22 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) +"mbv" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/disposalpipe/segment/corner{ + dir = 1 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "mbK" = ( /obj/structure/rack, /obj/item/poster/random_contraband, @@ -61166,19 +61262,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft2) -"meq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/structure/disposalpipe/segment/corner{ - dir = 8 - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "mez" = ( /turf/simulated/floor/plasteel{ dir = 1; @@ -63627,6 +63710,8 @@ dir = 9 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plating, @@ -65171,6 +65256,19 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_starboard) +"mVC" = ( +/obj/structure/table, +/obj/machinery/recharger, +/obj/machinery/camera{ + c_tag = "Research Firing Range"; + dir = 8; + network = list("Research","SS13") + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 4 + }, +/area/station/science/testrange) "mVF" = ( /obj/machinery/door/airlock/external{ id_tag = "specops_home"; @@ -67020,6 +67118,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/glass, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -67106,18 +67206,6 @@ /obj/effect/spawner/random/blood/maybe, /turf/simulated/floor/engine/cult, /area/station/maintenance/apmaint) -"npx" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Science Maintenance" - }, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, -/obj/machinery/door/poddoor/preopen{ - id_tag = "Biohazard"; - name = "Biohazard Shutter" - }, -/turf/simulated/floor/plating, -/area/station/maintenance/starboard) "npy" = ( /obj/machinery/light{ dir = 1 @@ -67129,6 +67217,15 @@ icon_state = "darkgrey" }, /area/station/security/prisonlockers) +"npz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) "npA" = ( /obj/structure/chair{ dir = 8 @@ -67262,6 +67359,8 @@ }, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/light/small{ @@ -67452,12 +67551,6 @@ icon_state = "darkgreycheck" }, /area/station/medical/break_room) -"nrQ" = ( -/obj/machinery/light{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "nrR" = ( /obj/structure/closet/crate, /obj/effect/spawner/random/maintenance, @@ -67483,26 +67576,6 @@ slowdown = -0.3 }, /area/station/hallway/spacebridge/security/west) -"nsa" = ( -/obj/structure/table, -/obj/item/radio{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/radio{ - pixel_x = 5; - pixel_y = 5 - }, -/obj/machinery/newscaster{ - dir = 8; - name = "east bump"; - pixel_x = 28 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 4 - }, -/area/station/science/explab) "nsb" = ( /obj/structure/closet/secure_closet/brig/temp/cell_1, /turf/simulated/floor/plasteel{ @@ -67613,6 +67686,10 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"ntR" = ( +/obj/machinery/door/airlock/maintenance, +/turf/simulated/floor/plating, +/area/station/maintenance/starboard) "nua" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -68428,6 +68505,15 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) +"nBZ" = ( +/obj/structure/rack, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/structure/railing{ + dir = 1 + }, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "nCc" = ( /obj/structure/table_frame, /obj/item/stack/rods, @@ -70395,16 +70481,6 @@ icon_state = "dark" }, /area/station/hallway/primary/central/west) -"nUn" = ( -/obj/machinery/power/apc/directional/north, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "nUr" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plasteel{ @@ -70671,6 +70747,8 @@ /obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -70880,12 +70958,18 @@ /area/station/public/park) "nYY" = ( /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -71288,6 +71372,8 @@ /area/station/hallway/secondary/entry/west) "ocN" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -71536,6 +71622,21 @@ /obj/structure/bookcase/manuals/engineering, /turf/simulated/floor/plating, /area/station/maintenance/apmaint2) +"ofe" = ( +/obj/machinery/door/airlock/research/glass, +/obj/effect/mapping_helpers/airlock/access/all/science/tox, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "ofj" = ( /obj/structure/sign/poster/official/random{ pixel_y = 32 @@ -73202,6 +73303,8 @@ /obj/effect/spawner/random/oil/maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -73365,12 +73468,6 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /turf/simulated/floor/plasteel, /area/station/engineering/control) -"oxy" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "oxC" = ( /obj/structure/cable{ icon_state = "4-8" @@ -73427,15 +73524,6 @@ icon_state = "whiteblue" }, /area/station/medical/surgery/secondary) -"oyl" = ( -/obj/machinery/alarm/directional/north, -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Chamber"; - dir = 6; - network = list("Experimentor","Research","SS13") - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "oys" = ( /obj/machinery/atmospherics/trinary/filter/flipped{ dir = 4; @@ -73599,12 +73687,6 @@ icon_state = "dark" }, /area/station/science/robotics/chargebay) -"ozG" = ( -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "ozW" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -74632,6 +74714,7 @@ /obj/item/hand_labeler, /obj/machinery/power/apc/directional/east, /obj/structure/cable{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/engine, @@ -75307,6 +75390,8 @@ /area/station/hallway/secondary/exit) "oQt" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -79024,9 +79109,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) -"pBo" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "pBp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -79615,6 +79697,9 @@ icon_state = "dark" }, /area/station/engineering/engine) +"pHv" = ( +/turf/simulated/floor/engine, +/area/station/science/testrange) "pHx" = ( /obj/structure/chair/comfy/black{ dir = 1 @@ -80223,12 +80308,6 @@ icon_state = "arrival" }, /area/station/hallway/secondary/entry/east) -"pMb" = ( -/obj/structure/closet/firecloset, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "pMe" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -81059,6 +81138,8 @@ /area/station/medical/virology) "pWx" = ( /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -81487,10 +81568,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"qbj" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "qbt" = ( /obj/item/kirbyplants, /obj/machinery/camera{ @@ -82380,6 +82457,8 @@ /area/station/engineering/solar/fore_starboard) "qkH" = ( /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/unary/vent_pump/on{ @@ -82871,6 +82950,8 @@ /area/station/maintenance/apmaint2) "qqd" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -83209,11 +83290,15 @@ /area/station/medical/surgery/observation) "quF" = ( /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/disposalpipe/segment/corner{ @@ -83897,6 +83982,9 @@ /obj/item/storage/toolbox/emergency, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"qBZ" = ( +/turf/simulated/wall/r_wall, +/area/station/science/testrange) "qCc" = ( /obj/structure/chair/comfy/black, /obj/structure/cable{ @@ -83985,26 +84073,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay) -"qCG" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, -/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, -/obj/structure/disposalpipe/sortjunction{ - dir = 4; - sort_type_txt = "13" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/research) "qCP" = ( /obj/structure/chair{ dir = 8 @@ -84266,12 +84334,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/security/aft_starboard) -"qFC" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "qFD" = ( /obj/structure/cable{ icon_state = "4-8" @@ -84439,6 +84501,8 @@ /area/station/science/toxins/mixing) "qHi" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/engine, @@ -85197,6 +85261,14 @@ icon_state = "freezerfloor" }, /area/station/medical/cryo) +"qPt" = ( +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "qPB" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -85522,6 +85594,8 @@ "qTa" = ( /obj/structure/girder, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/cyan{ @@ -88100,6 +88174,8 @@ /area/station/maintenance/dorms/starboard) "rqF" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -90435,6 +90511,7 @@ /obj/item/stock_parts/scanning_module, /obj/machinery/power/apc/directional/north, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /turf/simulated/floor/plasteel{ @@ -91097,6 +91174,8 @@ /area/station/maintenance/fpmaint) "rUl" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment{ @@ -93045,14 +93124,6 @@ /obj/effect/mapping_helpers/turfs/damage, /turf/simulated/floor/wood, /area/station/maintenance/abandonedbar) -"smU" = ( -/obj/effect/spawner/window/reinforced/plasma, -/obj/machinery/door/poddoor/preopen{ - id_tag = "telescienceblast"; - name = "test chamber blast doors" - }, -/turf/simulated/floor/plating, -/area/station/science/explab) "smX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple, /obj/structure/chair/comfy/black{ @@ -93186,6 +93257,8 @@ name = "Test Lab" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -93608,6 +93681,8 @@ /area/station/engineering/atmos/asteroid_filtering) "stK" = ( /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -94725,9 +94800,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"sEy" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab) "sEA" = ( /obj/machinery/door/airlock/public{ name = "Dorms Storefront 1"; @@ -94869,13 +94941,6 @@ icon_state = "barber" }, /area/station/security/permabrig) -"sFK" = ( -/obj/machinery/computer/rdconsole/experiment, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "sFP" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/dirt, @@ -95201,23 +95266,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/maintenance/security/fore) -"sJb" = ( -/obj/structure/table, -/obj/item/stack/package_wrap, -/obj/item/hand_labeler, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 24; - name = "east bump" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple"; - dir = 4 - }, -/area/station/science/explab) "sJx" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/machinery/door/poddoor/preopen{ @@ -95428,6 +95476,12 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel, /area/station/maintenance/aft) +"sLk" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) "sLu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plasteel{ @@ -97431,16 +97485,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard/south) -"tfz" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "tfB" = ( /obj/structure/closet/secure_closet/brig, /obj/structure/window/reinforced{ @@ -99864,6 +99908,8 @@ /area/station/maintenance/apmaint) "tEn" = ( /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -99951,13 +99997,6 @@ /obj/item/kirbyplants, /turf/simulated/floor/plasteel, /area/station/hallway/secondary/exit) -"tFh" = ( -/obj/structure/closet/l3closet/scientist, -/turf/simulated/floor/plasteel{ - dir = 6; - icon_state = "whitepurple" - }, -/area/station/science/explab) "tFi" = ( /obj/machinery/light_switch{ dir = 4; @@ -100249,6 +100288,8 @@ /area/station/maintenance/abandoned_office) "tIH" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -100650,6 +100691,8 @@ /area/station/maintenance/apmaint2) "tMa" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -100894,14 +100937,6 @@ icon_state = "cult" }, /area/station/maintenance/apmaint2) -"tOd" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 1 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "tOs" = ( /obj/item/stack/tile/carpet, /obj/effect/mapping_helpers/turfs/burn, @@ -100999,6 +101034,16 @@ }, /turf/simulated/floor/plasteel/airless, /area/station/science/toxins/test) +"tQo" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "tQz" = ( /obj/structure/table, /obj/item/book/manual/wiki/sop_service, @@ -101878,6 +101923,8 @@ /obj/effect/spawner/random/barrier/grille_maybe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -102944,6 +102991,8 @@ /area/station/engineering/tech_storage) "ukh" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -102970,12 +103019,6 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/starboard) -"uku" = ( -/turf/simulated/floor/plasteel{ - dir = 9; - icon_state = "whitepurple" - }, -/area/station/science/explab) "ukx" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -104233,19 +104276,6 @@ icon_state = "yellow" }, /area/station/engineering/break_room/secondary) -"uxz" = ( -/obj/effect/landmark/start/scientist, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/machinery/hologram/holopad, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "uxF" = ( /obj/structure/table, /obj/item/tank/internals/emergency_oxygen/engi, @@ -104291,6 +104321,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -106759,12 +106791,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/solar_maintenance/fore_port) -"uWd" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "uWf" = ( /obj/effect/spawner/random/trash, /obj/effect/decal/cleanable/dirt, @@ -106806,9 +106832,13 @@ /area/station/engineering/break_room) "uWH" = ( /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, @@ -107471,16 +107501,15 @@ /turf/simulated/floor/carpet, /area/station/public/arcade) "veX" = ( -/obj/machinery/disposal/delivery_chute{ - dir = 4; - pixel_x = -4 - }, /obj/machinery/door/window/classic/reversed{ dir = 4 }, /obj/structure/disposalpipe/trunk{ dir = 4 }, +/obj/machinery/disposal/delivery_chute{ + dir = 4 + }, /turf/simulated/floor/plasteel{ dir = 9; icon_state = "whitepurple" @@ -108447,9 +108476,12 @@ id = "rd" }, /obj/structure/cable{ + d2 = 4; icon_state = "0-4" }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -108626,6 +108658,16 @@ /obj/item/scissors, /turf/simulated/floor/plating, /area/station/maintenance/fpmaint) +"vqs" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/shelf/science, +/obj/effect/spawner/random/maintenance, +/obj/item/assembly/signaler{ + pixel_x = -2; + pixel_y = -2 + }, +/turf/simulated/floor/plasteel, +/area/station/maintenance/starboard) "vqv" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 4 @@ -109486,19 +109528,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/station/maintenance/aft) -"vzP" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/disposalpipe/segment/corner{ - dir = 2 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "vzX" = ( /obj/item/kirbyplants, /obj/machinery/firealarm/directional/west, @@ -109901,6 +109930,8 @@ /area/station/medical/sleeper) "vDP" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/turf_decal/stripes/line{ @@ -110356,15 +110387,6 @@ icon_state = "whitebluecorner" }, /area/station/medical/medbay2) -"vIi" = ( -/obj/machinery/light_switch{ - dir = 4; - name = "west bump"; - pixel_x = -24; - pixel_y = -8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "vIm" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -110892,6 +110914,12 @@ icon_state = "cautioncorner" }, /area/station/public/dorms) +"vMG" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purple" + }, +/area/station/science/testrange) "vMI" = ( /obj/structure/table, /obj/item/stack/package_wrap, @@ -111895,15 +111923,6 @@ icon_state = "dark" }, /area/station/engineering/secure_storage) -"vWF" = ( -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurple" - }, -/area/station/science/explab) "vWJ" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, @@ -112583,22 +112602,6 @@ }, /turf/simulated/floor/plasteel, /area/station/engineering/equipmentstorage) -"wdM" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/disposalpipe/junction/reversed{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/station/science/research) "wdQ" = ( /obj/structure/cable, /obj/machinery/power/apc/directional/south, @@ -112614,7 +112617,7 @@ }, /area/station/hallway/secondary/entry) "wdX" = ( -/obj/machinery/r_n_d/destructive_analyzer, +/obj/machinery/r_n_d/scientific_analyzer, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "purple" @@ -112835,9 +112838,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"wgu" = ( -/turf/simulated/wall, -/area/station/science/explab) "wgy" = ( /obj/structure/disposaloutlet{ dir = 8 @@ -114243,6 +114243,12 @@ }, /turf/simulated/floor/wood, /area/station/public/vacant_office) +"wuZ" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) "wva" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ @@ -114315,6 +114321,8 @@ name = "Test Chamber" }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -114812,6 +114820,8 @@ "wCd" = ( /obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -115471,7 +115481,7 @@ pixel_x = -3; pixel_y = 3 }, -/obj/item/circuitboard/destructive_analyzer, +/obj/item/circuitboard/scientific_analyzer, /obj/item/circuitboard/protolathe{ pixel_x = 3; pixel_y = -3 @@ -116490,6 +116500,8 @@ /area/station/engineering/atmos/distribution) "wUe" = ( /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -116641,15 +116653,6 @@ /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, /area/station/engineering/atmos/distribution) -"wWm" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "wWr" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -116762,6 +116765,32 @@ icon_state = "darkredcorners" }, /area/station/security/lobby) +"wXF" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/structure/cable{ + d1 = 1; + d2 = 4; + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold4w/hidden/scrubbers, +/obj/structure/disposalpipe/sortjunction{ + dir = 4; + sort_type_txt = "13" + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurplecorner" + }, +/area/station/science/research) "wXG" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 6 @@ -117749,6 +117778,10 @@ }, /turf/simulated/floor/plating, /area/station/security/prison) +"xif" = ( +/obj/structure/target_stake, +/turf/simulated/floor/engine, +/area/station/science/testrange) "xig" = ( /turf/simulated/wall, /area/station/security/processing) @@ -117793,6 +117826,19 @@ icon_state = "whitegreencorner" }, /area/station/medical/virology) +"xiz" = ( +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "xiE" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan, /obj/effect/turf_decal/stripes/line, @@ -118233,19 +118279,6 @@ icon_state = "dark" }, /area/station/science/genetics) -"xnu" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/item/radio/intercom{ - name = "west bump"; - pixel_x = -28 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/station/science/explab) "xnC" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -118426,6 +118459,8 @@ /area/station/security/main) "xpc" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -118702,6 +118737,8 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/random/barrier/grille_maybe, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ @@ -119037,6 +119074,8 @@ "xtZ" = ( /obj/effect/mapping_helpers/turfs/burn, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/disposalpipe/segment, @@ -120289,6 +120328,8 @@ /area/station/engineering/atmos/asteroid_maint) "xHV" = ( /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -120786,6 +120827,7 @@ "xNx" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable{ + d2 = 8; icon_state = "0-8" }, /turf/simulated/floor/plasteel{ @@ -121113,21 +121155,6 @@ icon_state = "dark" }, /area/station/science/server) -"xQM" = ( -/obj/machinery/power/apc/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/camera{ - c_tag = "Research E.X.P.E.R.I-MENTOR Lab"; - dir = 5; - network = list("Research","SS13") - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitepurple" - }, -/area/station/science/explab) "xQP" = ( /obj/structure/closet/secure_closet/brig/temp{ opened = 1 @@ -121563,6 +121590,9 @@ icon_state = "browncorner" }, /area/station/supply/lobby) +"xVg" = ( +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "xVh" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -122092,6 +122122,8 @@ /area/station/turret_protected/ai_upload) "ybg" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -122557,11 +122589,6 @@ }, /turf/simulated/floor/grass, /area/station/security/permabrig) -"yfM" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "yfS" = ( /obj/effect/spawner/window/reinforced, /obj/machinery/door/poddoor/preopen{ @@ -122576,17 +122603,6 @@ icon_state = "red" }, /area/station/security/execution) -"yfW" = ( -/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{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/explab) "ygm" = ( /obj/structure/lattice/catwalk, /obj/structure/cable{ @@ -167822,7 +167838,7 @@ vDF xhg wxD rDg -nsp +aHh gkK iXh bHM @@ -169105,7 +169121,7 @@ wCd eqw nnV ouZ -meq +izz ueN cEW iBG @@ -169354,16 +169370,16 @@ caq gRv mXw tYI -loN -loN -loN -loN -sEy -sEy -sEy -sEy -sEy -sEy +mXw +gRv +gRv +gRv +iCi +iCi +iCi +iCi +iCi +iCi wti xpc lBw @@ -169611,16 +169627,16 @@ caq gRv aAN dso -loN -oyl -vIi -pBo -fuE -uku -xQM -xnu -iic -wgu +jcy +jcy +gRv +mXw +iCi +pHv +pHv +iJx +nBZ +iCi dBN ybg xhg @@ -169868,16 +169884,16 @@ fIk vsW jcy iSD -loN -nrQ -qbj -qFC -smU -aNj -jub -tOd -pMb -kqh +gRv +cGm +cGm +caq +iCi +wuZ +xif +iJx +dtY +iCi bHo xpc xhg @@ -170125,16 +170141,16 @@ nGt bpH bpH bpp -loN -uWd -mbi -oxy -smU -sFK -uxz -ozG -lAP -kqh +gRv +gRv +bPz +vqs +iCi +npz +dUm +sLk +tQo +iCi bHo iBG xhg @@ -170382,16 +170398,16 @@ jcy caq pov nXe -loN -nUn -lim -tfz -eZR -yfW -dRo -wWm -vWF -kqh +gRv +mXw +fIk +vsW +iCi +vMG +xVg +dkd +bAu +aLg bHo xpc xhg @@ -170639,19 +170655,19 @@ caq caq hiH dso -loN -loN -loN -loN -sEy -aDy -hIL -lws -vzP -ieP -hXf -qCG -nxN +jcy +jcy +mXw +gRv +ntR +qPt +eVE +xiz +dtb +ofe +mbv +wXF +dId jEA quF qTK @@ -170900,14 +170916,14 @@ mXw xTH ekj mXw -npx -yfM -yfM -yfM -dKi -kqh +iCi +kVd +fFQ +xVg +bFO +aLg msd -wdM +iRp xhg dlW lQC @@ -171157,12 +171173,12 @@ fIk sAp igw nQD -wgu +iCi fCc -sJb -nsa -tFh -wgu +gkZ +mVC +kRj +iCi iyz ePo vCz @@ -171414,12 +171430,12 @@ xmn xmn xmn xmn -hHM -vql -vql -vql -vql -vql +qBZ +iCi +iCi +iCi +iCi +iCi viP kto gBU @@ -171936,9 +171952,9 @@ tIH soQ gkT nYY -oVs +fPk ocN -oVs +fPk yeO oVs yeO diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 2e680e79c25..3c8ba226f4e 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -66,6 +66,19 @@ }, /turf/simulated/floor/plating/airless, /area/station/engineering/solar/fore_port) +"abG" = ( +/obj/structure/table, +/obj/machinery/newscaster{ + dir = 4; + name = "west bump"; + pixel_x = -28 + }, +/obj/item/folder, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 8 + }, +/area/station/science/testrange) "abW" = ( /turf/simulated/wall/r_wall, /area/station/security/permabrig) @@ -160,6 +173,8 @@ /area/station/security/detective) "acS" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -343,16 +358,6 @@ }, /turf/simulated/floor/mineral/tranquillite, /area/station/service/mime) -"aeA" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/disposal, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "aeN" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -2764,6 +2769,8 @@ dir = 9 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/status_display{ @@ -3822,6 +3829,9 @@ /obj/effect/spawner/random/barrier/obstruction, /turf/simulated/floor/plating, /area/station/maintenance/fsmaint) +"ayn" = ( +/turf/simulated/wall, +/area/station/science/testrange) "ayr" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable{ @@ -6610,6 +6620,8 @@ /area/station/supply/warehouse) "aKq" = ( /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -6622,6 +6634,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -7854,6 +7868,8 @@ /area/station/supply/storage) "aOx" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, @@ -13422,35 +13438,6 @@ icon_state = "darkgrey" }, /area/station/engineering/tech_storage) -"bgp" = ( -/obj/structure/rack{ - dir = 8; - layer = 2.9 - }, -/obj/item/circuitboard/rdconsole{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/circuitboard/rdserver{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/circuitboard/destructive_analyzer, -/obj/item/circuitboard/protolathe{ - pixel_x = 3; - pixel_y = -3 - }, -/obj/item/circuitboard/circuit_imprinter{ - pixel_y = -6; - pixel_x = 6 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - icon_state = "dark" - }, -/area/station/engineering/tech_storage) "bgq" = ( /obj/structure/rack{ dir = 8; @@ -26413,10 +26400,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -28872,9 +28858,6 @@ icon_state = "whitepurple" }, /area/station/science/lobby) -"cgG" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab) "cgH" = ( /obj/machinery/light{ dir = 1 @@ -29019,11 +29002,6 @@ icon_state = "whitepurple" }, /area/station/command/office/rd) -"cha" = ( -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "chb" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -30169,7 +30147,7 @@ /turf/simulated/floor/plating/airless, /area/station/science/toxins/test) "clS" = ( -/obj/machinery/r_n_d/destructive_analyzer, +/obj/machinery/r_n_d/scientific_analyzer, /obj/machinery/recharger/wallcharger{ pixel_x = 32 }, @@ -30514,19 +30492,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/south) -"cnt" = ( -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/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 = "white" - }, -/area/station/science/explab) "cnw" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -30590,9 +30555,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) -"cnK" = ( -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "cnQ" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -30898,9 +30860,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/effect/decal/cleanable/dirt, @@ -31608,6 +31574,8 @@ dir = 9 }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/simulated/floor/plating, @@ -31845,6 +31813,8 @@ /obj/machinery/firealarm/directional/north, /obj/machinery/alarm/directional/east, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -32107,9 +32077,13 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -32160,12 +32134,6 @@ icon_state = "white" }, /area/station/science/research) -"cux" = ( -/obj/structure/window/plasmareinforced{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "cuy" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -32411,6 +32379,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -32724,6 +32694,8 @@ dir = 6 }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel{ @@ -32764,6 +32736,19 @@ icon_state = "whitepurple" }, /area/station/command/office/rd) +"cxd" = ( +/obj/structure/disposalpipe/junction/reversed{ + dir = 1 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "cxl" = ( /obj/machinery/light{ dir = 4 @@ -33836,6 +33821,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/grille/broken, @@ -34558,6 +34545,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/blood/drip, @@ -34676,9 +34665,13 @@ /area/station/science/toxins/test) "cFc" = ( /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -35960,21 +35953,12 @@ }, /area/station/science/xenobiology) "cKi" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/radio/intercom{ - name = "north bump"; - pixel_y = 28 - }, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light{ - dir = 1 - }, +/obj/structure/closet/firecloset, /turf/simulated/floor/plasteel{ - icon_state = "white" + dir = 9; + icon_state = "purple" }, -/area/station/science/explab) +/area/station/science/testrange) "cKj" = ( /obj/effect/turf_decal/delivery/blue/partial, /obj/effect/turf_decal/stripes/line, @@ -36049,10 +36033,6 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/aft/south) -"cKu" = ( -/obj/machinery/r_n_d/experimentor, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "cKv" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -36163,6 +36143,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -36351,15 +36333,6 @@ icon_state = "red" }, /area/station/hallway/secondary/exit) -"cLB" = ( -/obj/machinery/computer/rdconsole/experiment{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "cLE" = ( /obj/structure/sign/directions/science{ pixel_x = -32; @@ -36669,6 +36642,7 @@ /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc/directional/north, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /turf/simulated/floor/plating, @@ -36754,14 +36728,6 @@ icon_state = "whitebluefull" }, /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) "cNv" = ( /obj/machinery/power/smes, /obj/structure/cable, @@ -37510,6 +37476,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -38248,15 +38216,6 @@ icon_state = "whiteblue" }, /area/station/medical/medbay) -"cUf" = ( -/obj/machinery/power/apc/directional/west, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "cUg" = ( /obj/machinery/door/morgue{ name = "Chapel Garden" @@ -38835,6 +38794,8 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -39954,6 +39915,8 @@ dir = 6 }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel{ @@ -40461,6 +40424,17 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) +"dgz" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 2; + d2 = 8; + icon_state = "2-8" + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "dgC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, /turf/simulated/wall/r_wall, @@ -40564,6 +40538,15 @@ icon_state = "dark" }, /area/station/service/chapel/office) +"dhq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "dhw" = ( /obj/structure/flora/ausbushes/fernybush, /obj/structure/flora/ausbushes/ywflowers, @@ -40735,6 +40718,8 @@ /area/station/maintenance/medmaint) "diY" = ( /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel, @@ -40951,6 +40936,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -41059,6 +41046,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -41066,19 +41055,6 @@ icon_state = "whitepurple" }, /area/station/science/research) -"dpE" = ( -/obj/machinery/status_display{ - dir = 4; - pixel_y = -32 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurple" - }, -/area/station/science/research) "dpM" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -41175,15 +41151,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft2) -"dru" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "drL" = ( /obj/machinery/shower{ dir = 4 @@ -41487,16 +41454,15 @@ }, /area/station/medical/reception) "dAy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, /obj/structure/disposalpipe/junction/reversed{ dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 10 - }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/simulated/floor/plasteel{ @@ -42162,6 +42128,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -42731,6 +42699,22 @@ }, /turf/simulated/floor/wood, /area/station/public/mrchangs) +"efs" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "efR" = ( /obj/machinery/door/airlock/external/glass{ id_tag = "aisat_door_ext"; @@ -43578,10 +43562,6 @@ icon_state = "green" }, /area/station/security/permabrig) -"eAx" = ( -/obj/effect/decal/cleanable/blood/oil, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "eAC" = ( /obj/structure/table/reinforced, /obj/item/assembly/signaler{ @@ -43867,6 +43847,8 @@ "eIa" = ( /mob/living/carbon/human/monkey, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/engine, @@ -43933,6 +43915,12 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/aft2) +"eKh" = ( +/obj/structure/window/reinforced{ + dir = 1 + }, +/turf/simulated/floor/engine, +/area/station/science/testrange) "eKW" = ( /obj/machinery/door/airlock/security/glass{ name = "Brig" @@ -43993,6 +43981,8 @@ /area/station/hallway/primary/central/nw) "eMh" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/light/small{ @@ -44507,6 +44497,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -44730,9 +44722,13 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -45378,12 +45374,16 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 6 }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -45806,6 +45806,16 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/medmaint) +"fyV" = ( +/obj/structure/table, +/obj/machinery/alarm/directional/west, +/obj/item/storage/toolbox/mechanical, +/obj/item/weldingtool/research, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 8 + }, +/area/station/science/testrange) "fza" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 5 @@ -46273,6 +46283,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -46669,14 +46681,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) "fRl" = ( /obj/machinery/atmospherics/pipe/simple/hidden/purple{ dir = 4 @@ -46715,6 +46719,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -46957,6 +46963,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -46984,6 +46992,9 @@ }, /turf/simulated/floor/wood, /area/station/service/bar) +"fXl" = ( +/turf/simulated/floor/engine, +/area/station/science/testrange) "fXo" = ( /turf/simulated/wall, /area/station/hallway/primary/central/south) @@ -47267,6 +47278,8 @@ dir = 6 }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /turf/simulated/floor/plasteel{ @@ -47471,6 +47484,8 @@ dir = 6 }, /obj/structure/cable{ + d1 = 2; + d2 = 4; icon_state = "2-4" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -47791,9 +47806,6 @@ /obj/structure/disposalpipe/trunk{ dir = 4 }, -/obj/machinery/disposal/delivery_chute{ - dir = 1 - }, /obj/structure/window/reinforced{ dir = 4 }, @@ -47807,6 +47819,9 @@ dir = 8 }, /obj/machinery/firealarm/directional/south, +/obj/machinery/disposal/delivery_chute{ + dir = 1 + }, /turf/simulated/floor/plasteel{ dir = 10; icon_state = "purple" @@ -47919,6 +47934,18 @@ /obj/effect/mapping_helpers/turfs/rust/probably, /turf/simulated/wall/r_wall, /area/station/maintenance/aft2) +"gtJ" = ( +/obj/machinery/door/airlock/research, +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "gtW" = ( /obj/machinery/light/small{ dir = 8 @@ -48013,6 +48040,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -48755,13 +48784,6 @@ icon_state = "caution" }, /area/station/hallway/primary/starboard/east) -"gND" = ( -/obj/machinery/alarm/directional/north, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "gNO" = ( /obj/item/wirecutters, /obj/machinery/light/small{ @@ -49094,6 +49116,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -49670,14 +49694,6 @@ }, /turf/simulated/floor/carpet, /area/station/service/library) -"hiP" = ( -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "hjg" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 10 @@ -49883,6 +49899,8 @@ dir = 1 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/spawner/random/oil/maybe, @@ -50243,6 +50261,8 @@ /area/station/science/xenobiology) "hwy" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/structure/disposalpipe/segment/corner{ @@ -50286,6 +50306,19 @@ icon_state = "darkgrey" }, /area/station/science/storage) +"hwY" = ( +/obj/structure/rack, +/obj/item/target/alien, +/obj/item/target/alien, +/obj/machinery/camera{ + c_tag = "Research Firing Range"; + dir = 10; + network = list("Research","SS13") + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple" + }, +/area/station/science/testrange) "hxc" = ( /obj/item/tank/internals/oxygen{ pixel_x = -4; @@ -50316,6 +50349,22 @@ icon_state = "white" }, /area/station/medical/reception) +"hxi" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel{ + icon_state = "whitepurple" + }, +/area/station/science/research) "hxv" = ( /obj/machinery/camera{ c_tag = "Telecoms - Server Room - Aft"; @@ -50370,6 +50419,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -50708,6 +50759,12 @@ icon_state = "neutralcorner" }, /area/station/hallway/secondary/bridge) +"hFd" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "hFe" = ( /obj/structure/sign/vacuum/external, /obj/effect/spawner/window/reinforced/grilled, @@ -50921,9 +50978,13 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel{ @@ -51586,6 +51647,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -51950,6 +52013,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -52878,6 +52943,8 @@ }, /obj/machinery/door/firedoor, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/mapping_helpers/airlock/access/all/science/research, @@ -53240,22 +53307,6 @@ icon_state = "cautioncorner" }, /area/station/hallway/primary/starboard/east) -"iLj" = ( -/obj/effect/landmark/lightsout, -/obj/machinery/hologram/holopad, -/obj/effect/landmark/start/scientist, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "iLs" = ( /obj/structure/cable{ icon_state = "1-2" @@ -53928,14 +53979,14 @@ }, /area/station/medical/reception) "jcA" = ( -/obj/machinery/light/small{ - dir = 1 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/obj/structure/window/plasmareinforced{ - dir = 8 +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purple" }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/area/station/science/testrange) "jcD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -54098,6 +54149,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/engine{ @@ -54468,6 +54521,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -54912,6 +54967,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -55512,10 +55569,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 @@ -55890,6 +55943,8 @@ dir = 5 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel{ @@ -56074,6 +56129,16 @@ "kbN" = ( /turf/simulated/wall/r_wall, /area/station/security/execution) +"kbX" = ( +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 10 + }, +/area/station/science/testrange) "kcb" = ( /obj/structure/cable{ icon_state = "4-8" @@ -56257,6 +56322,8 @@ dir = 9 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -56600,16 +56667,6 @@ icon_state = "whitepurplecorner" }, /area/station/science/research) -"kqi" = ( -/obj/machinery/power/apc/directional/east, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "kqw" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ @@ -57135,9 +57192,13 @@ "kDU" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, @@ -57564,28 +57625,6 @@ icon_state = "whitegreen" }, /area/station/medical/virology) -"kNi" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - 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{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/windoor/autoname{ - dir = 8 - }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "kNk" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/ablative, @@ -57863,6 +57902,12 @@ /obj/structure/lattice/catwalk, /turf/space, /area/station/maintenance/xenobio_south) +"kTQ" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "kTZ" = ( /obj/machinery/atmospherics/binary/pump{ dir = 8; @@ -58140,6 +58185,8 @@ /area/station/public/dorms) "lar" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/engine, @@ -58359,21 +58406,6 @@ /obj/machinery/atmospherics/portable/canister, /turf/simulated/floor/plasteel, /area/station/engineering/atmos) -"lfu" = ( -/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" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "lfG" = ( /obj/machinery/atmospherics/unary/portables_connector, /obj/machinery/light/small{ @@ -58734,12 +58766,18 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 9 + }, /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, /obj/structure/cable{ - icon_state = "1-4" + d1 = 1; + d2 = 8; + icon_state = "1-8" }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -58785,6 +58823,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -58962,6 +59002,12 @@ icon_state = "darkgreycheck" }, /area/station/medical/break_room) +"lqg" = ( +/obj/machinery/light{ + dir = 1 + }, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "lqv" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -59162,6 +59208,10 @@ icon_state = "whitepurplefull" }, /area/station/science/storage) +"luN" = ( +/obj/machinery/light, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "luR" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -59910,6 +59960,8 @@ dir = 9 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel{ @@ -60786,6 +60838,8 @@ /area/station/medical/storage) "mfA" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply, @@ -60793,6 +60847,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -61249,6 +61305,8 @@ /area/station/supply/office) "mra" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -61261,6 +61319,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 2; + d2 = 8; icon_state = "2-8" }, /turf/simulated/floor/plasteel, @@ -61280,6 +61340,9 @@ icon_state = "whiteblue" }, /area/station/medical/exam_room) +"mrS" = ( +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "msj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -61402,6 +61465,8 @@ dir = 2 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel, @@ -62544,15 +62609,17 @@ /area/station/security/brig) "mVD" = ( /obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/research, /obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, -/turf/simulated/floor/plating, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/mapping_helpers/airlock/access/all/science/research, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/simulated/floor/plasteel, /area/station/maintenance/asmaint) "mVG" = ( /obj/structure/cable/yellow{ @@ -62729,6 +62796,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -63619,6 +63688,8 @@ /obj/effect/mapping_helpers/airlock/access/all/science/tox, /obj/machinery/door/firedoor/heavy, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -63993,6 +64064,10 @@ "nza" = ( /turf/simulated/floor/carpet, /area/station/public/vacant_office) +"nzb" = ( +/obj/structure/window/reinforced, +/turf/simulated/floor/engine, +/area/station/science/testrange) "nzf" = ( /obj/machinery/atmospherics/pipe/simple/heat_exchanging{ dir = 5 @@ -64741,6 +64816,8 @@ dir = 5 }, /obj/structure/cable{ + d1 = 1; + d2 = 4; icon_state = "1-4" }, /turf/simulated/floor/plasteel, @@ -64795,12 +64872,6 @@ /obj/effect/turf_decal/delivery, /turf/simulated/floor/wood, /area/station/service/bar) -"nUa" = ( -/obj/structure/table, -/turf/simulated/floor/plasteel{ - icon_state = "whitebluecorner" - }, -/area/station/science/explab) "nUu" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -65400,6 +65471,8 @@ dir = 1 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -65567,6 +65640,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -65633,6 +65708,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -65831,6 +65908,20 @@ }, /turf/simulated/floor/engine, /area/station/engineering/control) +"oxJ" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "whitepurple" + }, +/area/station/science/research) "oxT" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock, @@ -66014,6 +66105,8 @@ /area/station/engineering/atmos/distribution) "oCU" = ( /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/door/airlock/maintenance, @@ -66295,6 +66388,17 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/fore) +"oJa" = ( +/obj/structure/table, +/obj/item/clothing/glasses/science{ + pixel_x = 2; + pixel_y = 4 + }, +/turf/simulated/floor/plasteel{ + dir = 4; + icon_state = "purplecorner" + }, +/area/station/science/testrange) "oJo" = ( /obj/machinery/light_switch{ dir = 8; @@ -66621,6 +66725,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -66814,10 +66920,6 @@ /obj/machinery/alarm/directional/west, /turf/simulated/floor/plating, /area/station/maintenance/asmaint) -"oUs" = ( -/obj/machinery/light/small, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "oUw" = ( /obj/machinery/light/small{ dir = 1 @@ -68043,6 +68145,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /turf/simulated/floor/plating, /area/station/maintenance/starboard2) +"pwo" = ( +/obj/structure/target_stake, +/turf/simulated/floor/engine, +/area/station/science/testrange) "pwy" = ( /obj/structure/sign/securearea{ desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; @@ -68132,6 +68238,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden{ @@ -68169,9 +68277,13 @@ dir = 4 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -68720,22 +68832,6 @@ }, /turf/simulated/floor/bluegrid, /area/station/turret_protected/ai) -"pKM" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "pLD" = ( /obj/machinery/door_timer/cell_1{ pixel_x = -32 @@ -68779,6 +68875,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plating, @@ -69392,6 +69490,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel, @@ -69710,13 +69810,6 @@ icon_state = "red" }, /area/station/hallway/secondary/exit) -"qgw" = ( -/obj/structure/table, -/obj/item/flashlight/lamp, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "qgH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan{ dir = 4 @@ -69907,14 +70000,6 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) -"qlX" = ( -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "qma" = ( /obj/effect/turf_decal/stripes/corner, /turf/simulated/floor/plasteel{ @@ -69962,9 +70047,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/port) -"qmD" = ( -/turf/simulated/wall/r_wall, -/area/station/science/explab/chamber) "qmI" = ( /obj/machinery/door/firedoor, /turf/simulated/floor/plasteel{ @@ -70003,12 +70085,15 @@ /turf/simulated/floor/carpet, /area/station/legal/courtroom) "qnY" = ( -/obj/machinery/light/small, -/obj/structure/window/plasmareinforced{ - dir = 8 +/obj/effect/turf_decal/stripes/line{ + dir = 4 }, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) +/obj/structure/cable, +/obj/machinery/power/apc/directional/south, +/turf/simulated/floor/plasteel{ + icon_state = "purple" + }, +/area/station/science/testrange) "qof" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, @@ -70609,20 +70694,6 @@ icon_state = "neutralcorner" }, /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, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "qAP" = ( /obj/machinery/button/windowtint{ dir = 8; @@ -70814,6 +70885,9 @@ icon_state = "red" }, /area/station/security/permabrig) +"qGo" = ( +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "qGw" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/access/all/security/brig, @@ -70873,6 +70947,37 @@ icon_state = "dark" }, /area/station/security/main) +"qJI" = ( +/obj/structure/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/circuitboard/rdconsole{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/circuitboard/rdserver{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/circuitboard/scientific_analyzer, +/obj/item/circuitboard/protolathe{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/item/circuitboard/circuit_imprinter{ + pixel_y = -6; + pixel_x = 6 + }, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel{ + icon_state = "dark" + }, +/area/station/engineering/tech_storage) "qJN" = ( /obj/effect/spawner/random/trash, /turf/simulated/floor/plasteel{ @@ -71288,6 +71393,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -71599,6 +71706,8 @@ dir = 10 }, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -72065,25 +72174,6 @@ icon_state = "whiteblue" }, /area/station/security/permabrig) -"rlH" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/simulated/floor/plasteel{ - dir = 1; - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "rlJ" = ( /obj/machinery/atmospherics/pipe/manifold/visible/cyan, /obj/machinery/light, @@ -72479,16 +72569,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/carpet, /area/station/command/office/captain/bedroom) -"ruj" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/landmark/start/scientist, -/turf/simulated/floor/engine, -/area/station/science/explab/chamber) "ruo" = ( /obj/structure/rack, /obj/item/stack/cable_coil/random, @@ -73136,6 +73216,8 @@ /area/station/engineering/control) "rHl" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -73581,6 +73663,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -73633,6 +73717,13 @@ }, /turf/simulated/floor/plasteel, /area/station/maintenance/turbine) +"rQB" = ( +/obj/structure/extinguisher_cabinet{ + name = "south bump"; + pixel_y = -30 + }, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "rRg" = ( /obj/structure/closet, /obj/effect/spawner/random/maintenance, @@ -74788,19 +74879,22 @@ "svM" = ( /turf/simulated/wall/r_wall, /area/station/hallway/secondary/entry/north) +"svO" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/simulated/floor/plasteel{ + dir = 8; + icon_state = "purplecorner" + }, +/area/station/science/testrange) "svR" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 }, /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{ @@ -75096,6 +75190,25 @@ /obj/structure/cable, /turf/simulated/floor/plating, /area/station/maintenance/xenobio_south) +"sCY" = ( +/obj/structure/table, +/obj/machinery/light_switch{ + pixel_y = 24; + name = "north bump"; + pixel_x = -6 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_x = -3; + pixel_y = -2 + }, +/obj/item/clothing/ears/earmuffs{ + pixel_y = 3 + }, +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purple" + }, +/area/station/science/testrange) "sDf" = ( /obj/structure/cable, /obj/machinery/power/apc/directional/south, @@ -75756,6 +75869,14 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/aft) +"sPH" = ( +/obj/structure/cable{ + d1 = 4; + d2 = 8; + icon_state = "4-8" + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "sQg" = ( /obj/structure/table/glass, /obj/item/storage/box/donkpockets, @@ -75835,6 +75956,12 @@ }, /turf/simulated/floor/plasteel, /area/station/hallway/primary/fore/north) +"sRS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "sRU" = ( /turf/simulated/floor/plasteel{ dir = 4; @@ -77082,6 +77209,18 @@ }, /turf/simulated/floor/engine, /area/station/engineering/control) +"tvw" = ( +/obj/structure/table, +/obj/machinery/light{ + dir = 8 + }, +/obj/item/paper_bin, +/obj/item/pen, +/turf/simulated/floor/plasteel{ + icon_state = "purple"; + dir = 8 + }, +/area/station/science/testrange) "tvx" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -77092,6 +77231,12 @@ /obj/effect/turf_decal/stripes/line, /turf/simulated/floor/plating, /area/station/maintenance/disposal) +"twE" = ( +/turf/simulated/floor/plasteel{ + dir = 1; + icon_state = "purplecorner" + }, +/area/station/science/testrange) "twL" = ( /obj/machinery/alarm/directional/south, /obj/structure/cable{ @@ -77290,6 +77435,13 @@ icon_state = "darkblue" }, /area/station/security/armory/secure) +"tBB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/effect/turf_decal/delivery/hollow, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "tCf" = ( /obj/effect/landmark/start/scientist, /obj/machinery/atmospherics/pipe/manifold/visible{ @@ -77298,14 +77450,6 @@ }, /turf/simulated/floor/plasteel, /area/station/science/toxins/mixing) -"tCr" = ( -/obj/structure/table, -/obj/item/paper_bin, -/obj/item/pen, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "tCE" = ( /obj/machinery/atmospherics/pipe/simple/visible/yellow{ dir = 4 @@ -77397,6 +77541,8 @@ /area/space/nearstation) "tGP" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -77473,6 +77619,7 @@ "tId" = ( /obj/machinery/power/apc/directional/east, /obj/structure/cable{ + d2 = 2; icon_state = "0-2" }, /turf/simulated/floor/plasteel, @@ -77483,6 +77630,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -77795,17 +77944,6 @@ }, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) -"tRD" = ( -/obj/machinery/light_switch{ - dir = 1; - name = "south bump"; - pixel_y = -24 - }, -/turf/simulated/floor/plasteel{ - dir = 8; - icon_state = "whitebluecorner" - }, -/area/station/science/explab) "tRN" = ( /obj/effect/spawner/window/reinforced/grilled, /obj/structure/cable, @@ -77889,6 +78027,7 @@ }, /obj/machinery/power/apc/directional/south, /obj/structure/cable{ + d2 = 4; icon_state = "0-4" }, /turf/simulated/floor/plasteel{ @@ -77976,6 +78115,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -78025,6 +78166,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -79239,6 +79382,9 @@ icon_state = "dark" }, /area/station/security/armory/secure) +"uCe" = ( +/turf/simulated/wall/r_wall, +/area/station/science/testrange) "uCO" = ( /obj/structure/cable{ icon_state = "4-8" @@ -79457,14 +79603,6 @@ icon_state = "caution" }, /area/station/engineering/equipmentstorage) -"uHQ" = ( -/obj/machinery/atmospherics/unary/vent_pump/on{ - dir = 8 - }, -/turf/simulated/floor/plasteel{ - icon_state = "whitepurplecorner" - }, -/area/station/science/explab) "uHX" = ( /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 @@ -79712,17 +79850,6 @@ /obj/effect/spawner/window/reinforced/grilled, /turf/simulated/floor/plating, /area/station/security/permabrig) -"uMG" = ( -/obj/structure/disposalpipe/segment, -/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 = "whiteblue" - }, -/area/station/science/explab) "uMR" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plasteel{ @@ -79777,6 +79904,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -79857,6 +79986,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /obj/effect/mapping_helpers/airlock/windoor/access/all/science/tox{ @@ -80198,6 +80329,8 @@ /area/station/hallway/secondary/garden) "uXa" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, @@ -80615,6 +80748,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -81384,6 +81519,8 @@ dir = 4 }, /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /turf/simulated/floor/plasteel{ @@ -81559,6 +81696,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/door/firedoor, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -81844,6 +81983,8 @@ dir = 8 }, /obj/structure/cable{ + d1 = 1; + d2 = 8; icon_state = "1-8" }, /turf/simulated/floor/plasteel{ @@ -82467,13 +82608,8 @@ /area/station/medical/surgery/observation) "wcT" = ( /obj/effect/spawner/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id_tag = "rdrnd"; - name = "Research and Development Shutters"; - dir = 2 - }, /turf/simulated/floor/plating, -/area/station/science/explab) +/area/station/science/testrange) "wcU" = ( /obj/machinery/light, /turf/simulated/floor/plasteel, @@ -82746,6 +82882,15 @@ icon_state = "neutralcorner" }, /area/station/hallway/primary/central/north) +"wkq" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "wku" = ( /obj/effect/spawner/window/reinforced, /turf/simulated/floor/plating, @@ -83119,6 +83264,22 @@ }, /turf/simulated/floor/carpet/arcade, /area/station/public/arcade) +"wuJ" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/hologram/holopad, +/turf/simulated/floor/plasteel, +/area/station/science/testrange) "wuT" = ( /obj/structure/chair, /obj/effect/turf_decal/stripes/line{ @@ -83481,20 +83642,6 @@ icon_state = "green" }, /area/station/engineering/atmos/distribution) -"wDC" = ( -/obj/machinery/door/airlock/research, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/science/research, -/obj/structure/disposalpipe/segment, -/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 = "whitepurplefull" - }, -/area/station/science/explab) "wDM" = ( /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line{ @@ -84157,6 +84304,12 @@ icon_state = "white" }, /area/station/science/research) +"wWc" = ( +/obj/structure/sign/poster/official/random{ + pixel_y = 32 + }, +/turf/simulated/floor/catwalk, +/area/station/science/testrange) "wWh" = ( /obj/machinery/camera{ c_tag = "Central Primary Hallway - Port"; @@ -85045,6 +85198,19 @@ icon_state = "whiteblue" }, /area/station/medical/cryo) +"xoa" = ( +/obj/structure/table, +/obj/machinery/recharger{ + pixel_y = 5 + }, +/obj/item/radio/intercom{ + name = "south bump"; + pixel_y = -28 + }, +/turf/simulated/floor/plasteel{ + icon_state = "purplecorner" + }, +/area/station/science/testrange) "xoq" = ( /obj/machinery/newscaster{ name = "north bump"; @@ -85143,6 +85309,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/cyan, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plating, @@ -85169,13 +85337,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, @@ -86229,19 +86390,6 @@ icon_state = "white" }, /area/station/medical/surgery/observation) -"xPE" = ( -/obj/structure/table, -/obj/machinery/door_control{ - id = "rdrnd"; - name = "Experi-mentor shutters"; - pixel_x = -25; - pixel_y = null; - req_access = list(7) - }, -/turf/simulated/floor/plasteel{ - icon_state = "white" - }, -/area/station/science/explab) "xPO" = ( /obj/machinery/atmospherics/pipe/manifold/visible{ dir = 4; @@ -86490,6 +86638,8 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/cable{ + d1 = 1; + d2 = 2; icon_state = "1-2" }, /turf/simulated/floor/plasteel{ @@ -86517,6 +86667,8 @@ /area/station/engineering/control) "xXD" = ( /obj/structure/cable{ + d1 = 4; + d2 = 8; icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -117621,9 +117773,9 @@ waj des fWN xWQ -cOZ -cOZ -cOZ +oxJ +oxJ +oxJ jXi cFH cFH @@ -119421,13 +119573,13 @@ lAX dZB cGQ eVM -cgG -cgG -cgG -cgG -cgG -cgG -bdN +ayn +ayn +ayn +uCe +uCe +uCe +uCe fqp fqp bdN @@ -119678,13 +119830,13 @@ eZW cwV cQK lle -cgG +ayn cKi -cUf -xPE -tCr -qAH -bdN +abG +tvw +fyV +kbX +ayn oPh jes das @@ -119936,12 +120088,12 @@ vxI cwR bXi wcT -cha -hiP -qlX -fRh -nUa -bdN +twE +qGo +kTQ +qGo +svO +ayn gqC cKG wvJ @@ -120192,12 +120344,12 @@ mDX dnN cwR dAy -wDC -cnt -pKM -iLj -rlH -uMG +gtJ +wkq +wkq +wuJ +efs +cxd mVD pyh gVk @@ -120450,12 +120602,12 @@ dnN cwR tqF wcT -aeA -uHQ -cha -lfu -tRD -bdN +oJa +qGo +hFd +sPH +xoa +ayn vwU fqn vfd @@ -120706,13 +120858,13 @@ dRX hKb cwR xdT -cgG -qgw -cNu -cLB -lfu -cha -bdN +ayn +sCY +qGo +tBB +sPH +hwY +ayn fWB gqC tWK @@ -120960,16 +121112,16 @@ cAM hsg tHP kqO -mfG +hxi cwR -dpE -qmD +iGV +ayn jcA -cux -xrm -kNi +sRS +dhq +dgz qnY -bdN +ayn iWB jBw fGH @@ -121220,13 +121372,13 @@ kvG qTF cwR rcY -qmD -svV -cKu -cnK -ruj -cnK -bdN +ayn +mrS +eKh +fXl +nzb +rQB +ayn fVX gqC tIg @@ -121477,13 +121629,13 @@ kvG mYv cwR qta -qmD -cnK -eAx -cnK -dru -cnK -bdN +ayn +lqg +eKh +pwo +nzb +luN +ayn gWE gWE rPx @@ -121731,16 +121883,16 @@ cBL pQx bVa kvG -mfG +hxi cwR kib -qmD -gND -cnK -jPj -kqi -oUs -bdN +ayn +wWc +eKh +fXl +nzb +mrS +ayn bZy fCO fSa @@ -121988,16 +122140,16 @@ fId fId fId fId -mfG +hxi cwR tUS -bdN -bdN -bdN -bdN -bdN -bdN -bdN +uCe +uCe +uCe +uCe +uCe +uCe +uCe cKG ggT kgB @@ -122245,7 +122397,7 @@ cyP hGS uhP fId -mfG +hxi cwR dpk bdN @@ -124508,7 +124660,7 @@ eiI aLl bdt foR -bgp +qJI bhM bjy bbH diff --git a/code/game/area/ss13_areas/science_areas.dm b/code/game/area/ss13_areas/science_areas.dm index a06c38c270f..2c2734fcbb6 100644 --- a/code/game/area/ss13_areas/science_areas.dm +++ b/code/game/area/ss13_areas/science_areas.dm @@ -14,18 +14,6 @@ name = "\improper Robotics Showroom" icon_state = "showroom" -// Experimentor - -/area/station/science/explab - name = "\improper E.X.P.E.R.I-MENTOR Lab" - icon_state = "scilab" - request_console_flags = RC_SUPPLY - request_console_name = "Science" - -/area/station/science/explab/chamber - name = "\improper E.X.P.E.R.I-MENTOR Chamber" - icon_state = "scitest" - /area/station/science/research name = "Research Division" icon_state = "sci" @@ -34,6 +22,10 @@ name = "Research Division Lobby" icon_state = "sci" +/area/station/science/testrange + name = "Research Test Range" + icon_state = "sci" + /area/station/science/break_room name = "\improper Science Break Room" icon_state = "scibreak" diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index f8a16c6f5cf..908b472d988 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -363,11 +363,7 @@ icon_state = "science" build_path = /obj/machinery/computer/rdconsole/core req_access = list(ACCESS_TOX) // This is for adjusting the type of computer we're building - var/list/access_types = list("R&D Core", "E.X.P.E.R.I-MENTOR", "Public") - -/obj/item/circuitboard/rdconsole/experiment - board_name = "RD Console - E.X.P.E.R.I-MENTOR" - build_path = /obj/machinery/computer/rdconsole/experiment + var/list/access_types = list("R&D Core", "Public") /obj/item/circuitboard/rdconsole/public board_name = "RD Console - Public" @@ -540,9 +536,6 @@ if("R&D Core") board_name = "RD Console" build_path = /obj/machinery/computer/rdconsole/core - if("E.X.P.E.R.I-MENTOR") - board_name = "RD Console - E.X.P.E.R.I-MENTOR" - build_path = /obj/machinery/computer/rdconsole/experiment if("Public") board_name = "RD Console - Public" build_path = /obj/machinery/computer/rdconsole/public diff --git a/code/game/machinery/machine_frame.dm b/code/game/machinery/machine_frame.dm index b5033498d11..766f3ec2aef 100644 --- a/code/game/machinery/machine_frame.dm +++ b/code/game/machinery/machine_frame.dm @@ -716,22 +716,10 @@ to destroy them and players will be able to make replacements. /obj/item/stock_parts/manipulator = 2, /obj/item/stock_parts/matter_bin = 1) -//Almost the same recipe as destructive analyzer to give people choices. -/obj/item/circuitboard/experimentor - board_name = "E.X.P.E.R.I-MENTOR" +/obj/item/circuitboard/scientific_analyzer // fucking US spelling + board_name = "Scientific Analyzer" icon_state = "science" - build_path = /obj/machinery/r_n_d/experimentor - board_type = "machine" - origin_tech = "magnets=1;engineering=1;programming=1;biotech=1;bluespace=2" - req_components = list( - /obj/item/stock_parts/scanning_module = 1, - /obj/item/stock_parts/manipulator = 2, - /obj/item/stock_parts/micro_laser = 2) - -/obj/item/circuitboard/destructive_analyzer - board_name = "Destructive Analyzer" - icon_state = "science" - build_path = /obj/machinery/r_n_d/destructive_analyzer + build_path = /obj/machinery/r_n_d/scientific_analyzer board_type = "machine" origin_tech = "magnets=2;engineering=2;programming=2" req_components = list( diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index ce0f996496d..432c427c163 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -117,7 +117,7 @@ /obj/item/autosurgeon/organ = 50, /obj/item/mod/construction/plating/research = 25, - // Research / Experimentor + // Research /obj/item/paper/researchnotes = 125, // papers that give random R&D levels /obj/item/storage/box/telescience = 25, // Code green or blue. Probably not antags. People haven't touched it in ages. Let us see what happens. diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index 71e8df6d674..5632b8175cd 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -51,7 +51,6 @@ /obj/item/book/manual/wiki/chef_recipes, /obj/item/book/manual/wiki/engineering_construction, /obj/item/book/manual/wiki/engineering_guide, - /obj/item/book/manual/wiki/experimentor, /obj/item/book/manual/wiki/faxes, /obj/item/book/manual/wiki/hacking, /obj/item/book/manual/wiki/hydroponics, diff --git a/code/game/objects/items/weapons/manuals.dm b/code/game/objects/items/weapons/manuals.dm index 81889cfe102..23cf610f5cf 100644 --- a/code/game/objects/items/weapons/manuals.dm +++ b/code/game/objects/items/weapons/manuals.dm @@ -666,19 +666,19 @@

Science For Dummies

So you want to further SCIENCE? Good man/woman/thing! However, SCIENCE is a complicated process even though it's quite easy. For the most part, it's a three step process:
    -
  1. 1) Deconstruct items in the Destructive Analyzer to advance technology or improve the design.
  2. +
  3. 1) Deconstruct items in the Scientific Analyzer to advance technology or improve the design.
  4. 2) Build unlocked designs in the Protolathe and Circuit Imprinter
  5. 3) Repeat!
- Those are the basic steps to furthing science. What do you do science with, however? Well, you have four major tools: R&D Console, the Destructive Analyzer, the Protolathe, and the Circuit Imprinter. + Those are the basic steps to furthing science. What do you do science with, however? Well, you have four major tools: R&D Console, the Scientific Analyzer, the Protolathe, and the Circuit Imprinter.

The R&D Console

- The R&D console is the cornerstone of any research lab. It is the central system from which the Destructive Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controled. More on those systems in their own sections. On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, because if it gets damaged, you'll lose your data! In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database. + The R&D console is the cornerstone of any research lab. It is the central system from which the Scientific Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controled. More on those systems in their own sections. On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, because if it gets damaged, you'll lose your data! In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database. NOTE: The technology list screen, circuit imprinter, and protolathe menus are accessible by non-scientists. This is intended to allow 'public' systems for the plebians to utilize some new devices. -

Destructive Analyzer

- This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, you can destroy the object to further those sciences. Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Destructive Analyzer and improve their reliability rather then futher science. If their reliability is high enough ,it'll also advance their related technologies. +

Scientific Analyzer

+ This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, you can destroy the object to further those sciences. Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Scientific Analyzer and improve their reliability rather then futher science. If their reliability is high enough ,it'll also advance their related technologies.

Circuit Imprinter

This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules. @@ -687,7 +687,7 @@ This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid plasma, silver, gold, and diamonds along with a variety of chemicals to produce devices. The downside is that, again, not all devices you make are 100% reliable when you first discover them.

Reliability and You

- As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it. + As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Scientific Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Scientific Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it.

Building a Better Machine

Many machines produces from circuit boards and inserted into a machine frame require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. If you use these parts when constructing something, its attributes may be improved. For example, if you use an advanced matter bin when constructing an autolathe (rather then a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine. @@ -867,14 +867,6 @@ title = "Cyborgs for Dummies" wiki_article_title = "Guide_to_Robotics" -/obj/item/book/manual/wiki/experimentor - name = "Mentoring your Experiments" - desc = "A madman's ramblings on how to experiment with the E.X.P.E.R.I-MENTOR." - icon_state = "rdbook" - author = "Dr. H.P. Kritz" - title = "Mentoring your Experiments" - wiki_article_title = "Guide_to_the_E.X.P.E.R.I-MENTOR" - /obj/item/book/manual/wiki/chef_recipes name = "Chef Recipes" desc = "Knives, Ovens, and You: A guide to cooking." diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index b6e25d9c2f9..e91d653d796 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -324,7 +324,7 @@ new /obj/item/circuitboard/rdserver(src) new /obj/item/circuitboard/rdconsole(src) new /obj/item/circuitboard/protolathe(src) - new /obj/item/circuitboard/destructive_analyzer(src) + new /obj/item/circuitboard/scientific_analyzer(src) new /obj/item/circuitboard/circuit_imprinter(src) new /obj/item/stock_parts/manipulator(src) new /obj/item/stock_parts/manipulator(src) @@ -1142,7 +1142,7 @@ /obj/item/storage/box/rndboards/populate_contents() new /obj/item/circuitboard/protolathe(src) - new /obj/item/circuitboard/destructive_analyzer(src) + new /obj/item/circuitboard/scientific_analyzer(src) new /obj/item/circuitboard/circuit_imprinter(src) new /obj/item/circuitboard/rdconsole/public(src) new /obj/item/circuitboard/rnd_network_controller(src) diff --git a/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm b/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm index 814432d6234..a757f1034d7 100644 --- a/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm +++ b/code/modules/antagonists/mind_flayer/powers/flayer_mobility_powers.dm @@ -40,7 +40,6 @@ /obj/machinery/sleeper, /obj/machinery/bodyscanner, /obj/machinery/photocopier, // HI YES ONE FLAYER FAXED TO MY OFFICE PLEASE - /obj/machinery/r_n_d/experimentor, // Like anyone is ever gonna teleport to this /obj/machinery/barsign )) diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index 86648279f1f..8a7ad3c4deb 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -393,7 +393,7 @@ /obj/structure/closet/crate/secure/oldstation/research/populate_contents() new /obj/item/circuitboard/circuit_imprinter(src) - new /obj/item/circuitboard/destructive_analyzer(src) + new /obj/item/circuitboard/scientific_analyzer(src) new /obj/item/circuitboard/protolathe(src) new /obj/item/circuitboard/rdconsole/public(src) new /obj/item/circuitboard/rnd_network_controller(src) diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 69252548e7d..bf4fc11db9e 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -1040,17 +1040,18 @@ /obj/item/paper/researchnotes name = "paper - 'Research Notes'" - info = "The notes appear gibberish to you. Perhaps a destructive analyzer in R&D could make sense of them." + info = "The notes appear gibberish to you. Perhaps a scientific analyzer in R&D could make sense of them?" origin_tech = "combat=4;materials=4;engineering=4;biotech=4" -/obj/item/paper/researchnotes/New() - ..() +/obj/item/paper/researchnotes/Initialize(mapload) + . = ..() var/list/possible_techs = list("materials", "engineering", "plasmatech", "powerstorage", "bluespace", "biotech", "combat", "magnets", "programming", "syndicate") var/mytech = pick(possible_techs) var/mylevel = rand(7, 9) origin_tech = "[mytech]=[mylevel]" name = "research notes - [mytech] [mylevel]" +// I want this type dead /obj/item/paper/instruction name = "Instruction Notes" diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm index 744183f0e85..647ee8e2344 100644 --- a/code/modules/research/designs/machine_designs.dm +++ b/code/modules/research/designs/machine_designs.dm @@ -292,14 +292,14 @@ build_path = /obj/item/circuitboard/cyborgrecharger category = list("Research Machinery") -/datum/design/destructive_analyzer - name = "Machine Board (Destructive Analyzer)" - desc = "The circuit board for a Destructive Analyzer." - id = "destructive_analyzer" +/datum/design/scientific_analyzer + name = "Machine Board (Scientific Analyzer)" + desc = "The circuit board for a Scientific Analyzer." + id = "scientific_analyzer" req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2) build_type = IMPRINTER materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/destructive_analyzer + build_path = /obj/item/circuitboard/scientific_analyzer category = list("Research Machinery") /datum/design/mechfab @@ -322,16 +322,6 @@ build_path = /obj/item/circuitboard/mech_recharger category = list("Research Machinery") -/datum/design/experimentor - name = "Machine Design (E.X.P.E.R.I-MENTOR Board)" - desc = "The circuit board for an E.X.P.E.R.I-MENTOR." - id = "experimentor" - req_tech = list("programming" = 2, "magnets" = 2, "engineering" = 2, "bluespace" = 2) - build_type = IMPRINTER - materials = list(MAT_GLASS = 1000) - build_path = /obj/item/circuitboard/experimentor - category = list("Research Machinery") - /datum/design/protolathe name = "Machine Board (Protolathe)" desc = "The circuit board for a Protolathe." diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm deleted file mode 100644 index 7061b494e48..00000000000 --- a/code/modules/research/experimentor.dm +++ /dev/null @@ -1,605 +0,0 @@ -//this is designed to replace the destructive analyzer - -#define SCANTYPE_POKE 1 -#define SCANTYPE_IRRADIATE 2 -#define SCANTYPE_GAS 3 -#define SCANTYPE_HEAT 4 -#define SCANTYPE_COLD 5 -#define SCANTYPE_OBLITERATE 6 -#define SCANTYPE_DISCOVER 7 - -#define EFFECT_PROB_VERYLOW 20 -#define EFFECT_PROB_LOW 35 -#define EFFECT_PROB_MEDIUM 50 -#define EFFECT_PROB_HIGH 75 -#define EFFECT_PROB_VERYHIGH 95 - -#define FAIL 8 -/obj/machinery/r_n_d/experimentor - name = "\improper E.X.P.E.R.I-MENTOR" - icon = 'icons/obj/machines/heavy_lathe.dmi' - icon_state = "h_lathe" - density = TRUE - anchored = TRUE - power_state = IDLE_POWER_USE - var/recentlyExperimented = 0 - var/badThingCoeff = 0 - var/resetTime = 15 - var/cloneMode = FALSE - var/cloneCount = 0 - var/list/item_reactions = list() - var/list/valid_items = list() //valid items for special reactions like transforming - var/list/critical_items = list() //items that can cause critical reactions - var/list/blocked_items = list(/obj/item/reagent_containers/drinks/bottle/dragonsbreath, - /obj/item/reagent_containers/drinks/bottle/immortality) - /// Used for linking with rnd consoles - var/range = 5 - -/obj/machinery/r_n_d/experimentor/proc/ConvertReqString2List(list/source_list) - var/list/temp_list = params2list(source_list) - for(var/O in temp_list) - temp_list[O] = text2num(temp_list[O]) - return temp_list - -/obj/machinery/r_n_d/experimentor/proc/SetTypeReactions() - var/probWeight = 0 - for(var/I in typesof(/obj/item)) - if(istype(I,/obj/item/relic)) //does istype even work here - item_reactions["[I]"] = SCANTYPE_DISCOVER - else - item_reactions["[I]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) - if(ispath(I,/obj/item/stock_parts) || ispath(I,/obj/item/grenade/chem_grenade) || ispath(I,/obj/item/kitchen)) - var/obj/item/tempCheck = I - if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way - valid_items += 15 - valid_items += I - probWeight++ - - if(ispath(I,/obj/item/food)) - var/obj/item/tempCheck = I - if(I in blocked_items) - continue - if(initial(tempCheck.icon_state) != null) //check it's an actual usable item, in a hacky way - valid_items += rand(1,max(2,35-probWeight)) - valid_items += I - - if(ispath(I,/obj/item/rcd) || ispath(I,/obj/item/grenade) || ispath(I,/obj/item/aicard) || ispath(I,/obj/item/storage/backpack/holding) || ispath(I,/obj/item/slime_extract) || ispath(I,/obj/item/onetankbomb) || ispath(I,/obj/item/transfer_valve)) - var/obj/item/tempCheck = I - if(initial(tempCheck.icon_state) != null) - critical_items += I - -/obj/machinery/r_n_d/experimentor/Initialize(mapload) // DIEEEEEEEEEEEEEEEEEEEEEEE - . = ..() - component_parts = list() - component_parts += new /obj/item/circuitboard/experimentor(src) - component_parts += new /obj/item/stock_parts/scanning_module(src) - component_parts += new /obj/item/stock_parts/manipulator(src) - component_parts += new /obj/item/stock_parts/manipulator(src) - component_parts += new /obj/item/stock_parts/micro_laser(src) - component_parts += new /obj/item/stock_parts/micro_laser(src) - SetTypeReactions() - RefreshParts() - return INITIALIZE_HINT_LATELOAD - -/obj/machinery/r_n_d/experimentor/RefreshParts() - for(var/obj/item/stock_parts/manipulator/M in component_parts) - if(resetTime > 0 && (resetTime - M.rating) >= 1) - resetTime -= M.rating - for(var/obj/item/stock_parts/scanning_module/M in component_parts) - badThingCoeff += M.rating*2 - for(var/obj/item/stock_parts/micro_laser/M in component_parts) - badThingCoeff += M.rating - -/obj/machinery/r_n_d/experimentor/proc/checkCircumstances(obj/item/O) - //snowflake check to only take "made" bombs - if(istype(O,/obj/item/transfer_valve)) - var/obj/item/transfer_valve/T = O - if(!T.tank_one || !T.tank_two || !T.attached_device) - return FALSE - return TRUE - -/obj/machinery/r_n_d/experimentor/attackby__legacy__attackchain(obj/item/O, mob/user, params) - if(istype(O, /obj/item/storage/part_replacer)) - return ..() - - if(!checkCircumstances(O)) - to_chat(user, "[O] is not yet valid for [src] and must be completed!") - return - - if(!linked_console) - to_chat(user, "[src] must be linked to an R&D console first!") - return - - if(loaded_item) - to_chat(user, "[src] is already loaded.") - return - - if(isitem(O)) - if(!O.origin_tech) - to_chat(user, "This doesn't seem to have a tech origin!") - return - - var/list/temp_tech = ConvertReqString2List(O.origin_tech) - if(length(temp_tech) == 0) - to_chat(user, "You cannot experiment on this item!") - return - - if(!user.drop_item()) - return - - loaded_item = O - O.loc = src - to_chat(user, "You add [O] to the machine.") - flick("h_lathe_load", src) - -/obj/machinery/r_n_d/experimentor/crowbar_act(mob/user, obj/item/I) - if(!panel_open) - return - . = TRUE - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) - return - ejectItem() - default_deconstruction_crowbar(user, I) - -/obj/machinery/r_n_d/experimentor/screwdriver_act(mob/user, obj/item/I) - . = TRUE - if(!I.use_tool(src, user, 0, volume = I.tool_volume)) - return - default_deconstruction_screwdriver(user, "h_lathe_maint", "h_lathe", I) - if(linked_console) - linked_console.linked_destroy = null - linked_console = null - -/obj/machinery/r_n_d/experimentor/attack_hand(mob/user) - if(..()) - return - - interact(user) - -/obj/machinery/r_n_d/experimentor/interact(mob/living/carbon/human/user) - user.set_machine(src) - - var/dat = "
" - if(!linked_console) - dat += "Scan for R&D Console
" - if(loaded_item) - dat += "Loaded Item: [loaded_item]
" - dat += "Technology:
" - var/list/D = ConvertReqString2List(loaded_item.origin_tech) - for(var/T in D) - dat += "[T]
" - dat += "

Available tests:" - dat += "
Poke" - dat += "
Irradiate" - dat += "
Gas" - dat += "
Burn" - dat += "
Freeze" - dat += "
Destroy
" - if(istype(loaded_item,/obj/item/relic)) - dat += "
Discover
" - dat += "
Eject" - else - dat += "Nothing loaded." - dat += "
Refresh
" - dat += "
Close
" - var/datum/browser/popup = new(user, "experimentor","Experimentor", 700, 400) - popup.set_content(dat) - popup.open() - onclose(user, "experimentor") - -/obj/machinery/r_n_d/experimentor/proc/matchReaction(matching,reaction) - var/obj/item/D = matching - if(D) - if(item_reactions.Find("[D.type]")) - var/tor = item_reactions["[D.type]"] - if(tor == text2num(reaction)) - return tor - else - return FAIL - else - return FAIL - else - return FAIL - -/obj/machinery/r_n_d/experimentor/proc/ejectItem(delete=FALSE) - if(loaded_item) - if(cloneMode && cloneCount > 0) - visible_message("A duplicate [loaded_item] pops out!") - var/type_to_make = loaded_item.type - new type_to_make(get_turf(pick(oview(1,src)))) - --cloneCount - if(cloneCount == 0) - cloneMode = FALSE - return - var/turf/dropturf = get_turf(pick(view(1,src))) - if(!dropturf) //Failsafe to prevent the object being lost in the void forever. - dropturf = get_turf(src) - loaded_item.loc = dropturf - if(delete) - qdel(loaded_item) - loaded_item = null - -/obj/machinery/r_n_d/experimentor/proc/throwSmoke(turf/where) - var/datum/effect_system/smoke_spread/smoke = new - smoke.set_up(1, FALSE, where) - smoke.start() - -/obj/machinery/r_n_d/experimentor/proc/pickWeighted(list/from) - var/result = FALSE - var/counter = 1 - while(!result) - var/probtocheck = from[counter] - if(prob(probtocheck)) - result = TRUE - return from[counter+1] - if(counter + 2 < length(from)) - counter = counter + 2 - else - counter = 1 - -/obj/machinery/r_n_d/experimentor/proc/experiment(exp,obj/item/exp_on) - recentlyExperimented = 1 - icon_state = "h_lathe_wloop" - var/chosenchem - var/criticalReaction = (exp_on.type in critical_items) ? TRUE : FALSE - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == SCANTYPE_POKE) - visible_message("[src] prods at [exp_on] with mechanical arms.") - if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] is gripped in just the right way, enhancing its focus.") - badThingCoeff++ - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions and destroys [exp_on], lashing its arms out at nearby people!") - for(var/mob/living/m in oview(1, src)) - m.apply_damage(15,BRUTE,pick("head","chest","groin")) - investigate_log("Experimentor dealt minor brute to [m].", "experimentor") - ejectItem(TRUE) - if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions!") - exp = SCANTYPE_OBLITERATE - if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, throwing [exp_on]!") - var/mob/living/target = locate(/mob/living) in oview(7,src) - if(target) - var/obj/item/throwing = loaded_item - investigate_log("Experimentor has thrown [loaded_item] at [target]", "experimentor") - ejectItem() - if(throwing) - throwing.throw_at(target, 10, 1) - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == SCANTYPE_IRRADIATE) - visible_message("[src] reflects radioactive rays at [exp_on]!") - if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] has activated an unknown subroutine!") - cloneMode = TRUE - cloneCount = badThingCoeff - investigate_log("Experimentor has made a clone of [exp_on]", "experimentor") - ejectItem() - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!") - radiation_pulse(src, 500) - ejectItem(TRUE) - if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, spewing toxic waste!") - for(var/turf/T in oview(1, src)) - if(!T.density) - if(prob(EFFECT_PROB_VERYHIGH)) - new /obj/effect/decal/cleanable/greenglow(T) - if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - var/savedName = "[exp_on]" - ejectItem(TRUE) - var/newPath = pickWeighted(valid_items) - loaded_item = new newPath(src) - visible_message("[src] malfunctions, transforming [savedName] into [loaded_item]!") - investigate_log("Experimentor has transformed [savedName] into [loaded_item]", "experimentor") - if(istype(loaded_item,/obj/item/grenade/chem_grenade)) - var/obj/item/grenade/chem_grenade/CG = loaded_item - CG.prime() - ejectItem() - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == SCANTYPE_GAS) - visible_message("[src] fills its chamber with gas, [exp_on] included.") - if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[exp_on] achieves the perfect mix!") - new /obj/item/stack/sheet/mineral/plasma(get_turf(pick(oview(1,src)))) - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] destroys [exp_on], leaking dangerous gas!") - chosenchem = pick("carbon","radium","toxin","condensedcapsaicin","psilocybin","space_drugs","ethanol","beepskysmash") - var/datum/reagents/R = new/datum/reagents(15) - R.my_atom = src - R.add_reagent(chosenchem , 15) - investigate_log("Experimentor has released [chosenchem] smoke.", "experimentor") - var/datum/effect_system/smoke_spread/chem/smoke = new - smoke.set_up(R, src, TRUE) - playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) - smoke.start() - qdel(R) - ejectItem(TRUE) - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src]'s chemical chamber has sprung a leak!") - chosenchem = pick("mutationtoxin","nanomachines","sacid") - var/datum/reagents/R = new/datum/reagents(15) - R.my_atom = src - R.add_reagent(chosenchem , 15) - var/datum/effect_system/smoke_spread/chem/smoke = new - smoke.set_up(R, src, TRUE) - playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) - smoke.start() - qdel(R) - ejectItem(TRUE) - warn_admins(usr, "[chosenchem] smoke") - investigate_log("Experimentor has released [chosenchem] smoke!", "experimentor") - if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, spewing harmless gas.>") - throwSmoke(loc) - if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] melts [exp_on], ionizing the air around it!") - empulse(loc, 4, 0) //change this to 4,6 once the EXPERI-Mentor is moved. - investigate_log("Experimentor has generated an Electromagnetic Pulse.", "experimentor") - ejectItem(TRUE) - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == SCANTYPE_HEAT) - visible_message("[src] raises [exp_on]'s temperature.") - if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s emergency coolant system gives off a small ding!") - playsound(loc, 'sound/machines/ding.ogg', 50, 1) - var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src)))) - chosenchem = pick("plasma","capsaicin","ethanol") - C.reagents.remove_any(25) - C.reagents.add_reagent(chosenchem , 50) - C.name = "Cup of Suspicious Liquid" - C.desc = "It has a large hazard symbol printed on the side in fading ink." - investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor") - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - var/turf/start = get_turf(src) - var/mob/M = locate(/mob/living) in view(src, 3) - var/turf/MT = get_turf(M) - if(MT) - visible_message("[src] dangerously overheats, launching a flaming fuel orb!") - investigate_log("Experimentor has launched a fireball at [M]!", "experimentor") - var/obj/item/projectile/magic/fireball/FB = new /obj/item/projectile/magic/fireball(start) - FB.original = MT - FB.current = start - FB.yo = MT.y - start.y - FB.xo = MT.x - start.x - FB.fire() - if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!") - explosion(loc, -1, 0, 0, 0, 0, flame_range = 2) - investigate_log("Experimentor started a fire.", "experimentor") - ejectItem(TRUE) - if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, melting [exp_on] and leaking hot air!") - var/datum/milla_safe/experimentor_temperature/milla = new() - milla.invoke_async(src, 100000, 1000) - investigate_log("Experimentor has released hot air.", "experimentor") - ejectItem(TRUE) - if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, activating its emergency coolant systems!") - throwSmoke(loc) - for(var/mob/living/m in oview(1, src)) - m.apply_damage(5,BURN,pick("head","chest","groin")) - investigate_log("Experimentor has dealt minor burn damage to [m]", "experimentor") - ejectItem() - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == SCANTYPE_COLD) - visible_message("[src] lowers [exp_on]'s temperature.") - if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s emergency coolant system gives off a small ding!") - var/obj/item/reagent_containers/drinks/coffee/C = new /obj/item/reagent_containers/drinks/coffee(get_turf(pick(oview(1,src)))) - playsound(loc, 'sound/machines/ding.ogg', 50, 1) //Ding! Your death coffee is ready! - chosenchem = pick("uranium","frostoil","ephedrine") - C.reagents.remove_any(25) - C.reagents.add_reagent(chosenchem , 50) - C.name = "Cup of Suspicious Liquid" - C.desc = "It has a large hazard symbol printed on the side in fading ink." - investigate_log("Experimentor has made a cup of [chosenchem] coffee.", "experimentor") - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src] malfunctions, shattering [exp_on] and releasing a dangerous cloud of coolant!") - var/datum/reagents/R = new/datum/reagents(15) - R.my_atom = src - R.add_reagent("frostoil" , 15) - investigate_log("Experimentor has released frostoil gas.", "experimentor") - var/datum/effect_system/smoke_spread/chem/smoke = new - smoke.set_up(R, src, TRUE) - playsound(loc, 'sound/effects/smoke.ogg', 50, TRUE, -3) - smoke.start() - qdel(R) - ejectItem(TRUE) - if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src] malfunctions, shattering [exp_on] and leaking cold air!") - var/datum/milla_safe/experimentor_temperature/milla = new() - milla.invoke_async(src, -75000, 1000, TCMB) - investigate_log("Experimentor has released cold air.", "experimentor") - ejectItem(TRUE) - if(prob(EFFECT_PROB_MEDIUM-badThingCoeff)) - visible_message("[src] malfunctions, releasing a flurry of chilly air as [exp_on] pops out!") - var/datum/effect_system/smoke_spread/smoke = new - smoke.set_up(1, FALSE, loc) - smoke.start() - ejectItem() - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == SCANTYPE_OBLITERATE) - visible_message("[exp_on] activates the crushing mechanism, [exp_on] is destroyed!") - if(prob(EFFECT_PROB_LOW) && criticalReaction) - visible_message("[src]'s crushing mechanism slowly and smoothly descends, flattening [exp_on]!") - new /obj/item/stack/sheet/plasteel(get_turf(pick(oview(1,src)))) - if(linked_console.linked_lathe) - var/datum/component/material_container/linked_materials = linked_console.linked_lathe.GetComponent(/datum/component/material_container) - for(var/material in exp_on.materials) - linked_materials.insert_amount( min((linked_materials.max_amount - linked_materials.total_amount), (exp_on.materials[material])), material) - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff)) - visible_message("[src]'s crusher goes way too many levels too high, crushing right through space-time!") - playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -3) - investigate_log("Experimentor has triggered the 'throw things' reaction.", "experimentor") - for(var/atom/movable/AM in oview(7,src)) - if(!AM.anchored) - spawn(0) - AM.throw_at(src,10,1) - - if(prob(EFFECT_PROB_LOW-badThingCoeff)) - visible_message("[src]'s crusher goes one level too high, crushing right into space-time!") - playsound(loc, 'sound/effects/supermatter.ogg', 50, TRUE, -3) - investigate_log("Experimentor has triggered the 'minor throw things' reaction.", "experimentor") - var/list/throwAt = list() - for(var/atom/movable/AM in oview(7,src)) - if(!AM.anchored) - throwAt.Add(AM) - for(var/counter = 1, counter < length(throwAt), ++counter) - var/atom/movable/cast = throwAt[counter] - spawn(0) - cast.throw_at(pick(throwAt),10,1) - ejectItem(TRUE) - //////////////////////////////////////////////////////////////////////////////////////////////// - if(exp == FAIL) - var/a = pick("rumbles","shakes","vibrates","shudders") - var/b = pick("crushes","spins","viscerates","smashes","insults") - visible_message("[exp_on] [a], and [b], the experiment was a failure.") - - if(exp == SCANTYPE_DISCOVER) - visible_message("[src] scans [exp_on], revealing its true nature!") - playsound(loc, 'sound/effects/supermatter.ogg', 50, 3, -1) - var/obj/item/relic/R = loaded_item - R.reveal() - investigate_log("Experimentor has revealed a relic with effect ID [R.function_id] effect.", "experimentor") - ejectItem() - - //Global reactions - - if(prob(EFFECT_PROB_VERYLOW) && prob(13)) - visible_message("Experimentor draws the life essence of those nearby!") - for(var/mob/living/m in view(4,src)) - to_chat(m, "You feel your flesh being torn from you, mists of blood drifting to [src]!") - m.take_overall_damage(50) - investigate_log("Experimentor has taken 50 brute a blood sacrifice from [m]", "experimentor") - - if(prob(EFFECT_PROB_VERYLOW-badThingCoeff) && prob(87)) - var/globalMalf = rand(1,87) - if(globalMalf < 15) - visible_message("[src]'s onboard detection system has malfunctioned!") - item_reactions["[exp_on.type]"] = pick(SCANTYPE_POKE,SCANTYPE_IRRADIATE,SCANTYPE_GAS,SCANTYPE_HEAT,SCANTYPE_COLD,SCANTYPE_OBLITERATE) - ejectItem() - if(globalMalf > 16 && globalMalf < 35) - visible_message("[src] melts [exp_on], ian-izing the air around it!") - throwSmoke(loc) - var/mob/living/tracked_ian = locate(/mob/living/simple_animal/pet/dog/corgi/ian) in GLOB.mob_living_list - if(tracked_ian) - throwSmoke(tracked_ian.loc) - tracked_ian.loc = loc - if(tracked_ian.buckled) - tracked_ian.unbuckle(force = TRUE) - investigate_log("Experimentor has stolen Ian!", "experimentor") //...if anyone ever fixes it... - else - new /mob/living/simple_animal/pet/dog/corgi(loc) - investigate_log("Experimentor has spawned a new corgi.", "experimentor") - ejectItem(TRUE) - if(globalMalf > 36 && globalMalf < 59) - visible_message("[src] encounters a run-time error!") - throwSmoke(loc) - var/mob/living/tracked_runtime = locate(/mob/living/simple_animal/pet/cat/runtime) in GLOB.mob_living_list - if(tracked_runtime) - throwSmoke(tracked_runtime.loc) - tracked_runtime.loc = loc - if(tracked_runtime.buckled) - tracked_runtime.unbuckle(force = TRUE) - investigate_log("Experimentor has stolen Runtime!", "experimentor") - else - new /mob/living/simple_animal/pet/cat(loc) - investigate_log("Experimentor failed to steal runtime, and instead spawned a new cat.", "experimentor") - ejectItem(TRUE) - if(globalMalf > 60) - visible_message("[src] begins to smoke and hiss, shaking violently!") - use_power(500000) - investigate_log("Experimentor has drained power from its APC", "experimentor") - - spawn(resetTime) - icon_state = "h_lathe" - recentlyExperimented = 0 - -/datum/milla_safe/experimentor_temperature - -/datum/milla_safe/experimentor_temperature/on_run(obj/machinery/r_n_d/experimentor/experimentor, delta, min_new_temp) - var/turf/T = get_turf(experimentor) - var/datum/gas_mixture/env = get_turf_air(T) - - var/transfer_moles = 0.25 * env.total_moles() - var/datum/gas_mixture/removed = env.remove(transfer_moles) - if(removed) - var/heat_capacity = removed.heat_capacity() - if(heat_capacity == 0 || heat_capacity == null) - heat_capacity = 1 - removed.set_temperature(max(min_new_temp, (removed.temperature() * heat_capacity + delta) / heat_capacity)) - env.merge(removed) - -/obj/machinery/r_n_d/experimentor/Topic(href, href_list) - if(..()) - return - if(!Adjacent(usr) && !issilicon(usr)) - return - usr.set_machine(src) - - var/scantype = href_list["function"] - var/obj/item/process = locate(href_list["item"]) in src - - if(href_list["close"]) - usr << browse(null, "window=experimentor") - return - else if(scantype == "search") - var/obj/machinery/computer/rdconsole/D = locate(/obj/machinery/computer/rdconsole) in orange(range, src) - if(D) - linked_console = D - else if(scantype == "eject") - ejectItem() - else if(scantype == "refresh") - updateUsrDialog() - else - if(recentlyExperimented) - to_chat(usr, "[src] has been used too recently!") - return - else if(!loaded_item) - updateUsrDialog() //Set the interface to unloaded mode - to_chat(usr, "[src] is not currently loaded!") - return - else if(!process || process != loaded_item) //Interface exploit protection (such as hrefs or swapping items with interface set to old item) - updateUsrDialog() //Refresh interface to update interface hrefs - to_chat(usr, "Interface failure detected in [src]. Please try again.") - return - var/dotype - if(text2num(scantype) == SCANTYPE_DISCOVER) - dotype = SCANTYPE_DISCOVER - else - dotype = matchReaction(process,scantype) - experiment(dotype,process) - use_power(750) - if(dotype != FAIL) - if(process && process.origin_tech) - var/list/temp_tech = ConvertReqString2List(process.origin_tech) - var/datum/research/F = linked_console.get_files() - if(!F) - return - for(var/T in temp_tech) - F.UpdateTech(T, temp_tech[T]) - updateUsrDialog() - return - -//~~~~~~~~Admin logging proc, aka the Powergamer Alarm~~~~~~~~ -/obj/machinery/r_n_d/experimentor/proc/warn_admins(mob/user, ReactionName) - var/turf/T = get_turf(src) - message_admins("Experimentor reaction: [ReactionName] generated by [key_name_admin(user)] at ([T.x], [T.y], [T.z] - JMP)",0,1) - log_game("Experimentor reaction: [ReactionName] generated by [key_name(user)] in ([T.x], [T.y], [T.z])") - -#undef SCANTYPE_POKE -#undef SCANTYPE_IRRADIATE -#undef SCANTYPE_GAS -#undef SCANTYPE_HEAT -#undef SCANTYPE_COLD -#undef SCANTYPE_OBLITERATE -#undef SCANTYPE_DISCOVER - -#undef EFFECT_PROB_VERYLOW -#undef EFFECT_PROB_LOW -#undef EFFECT_PROB_MEDIUM -#undef EFFECT_PROB_HIGH -#undef EFFECT_PROB_VERYHIGH - -#undef FAIL diff --git a/code/modules/research/rd-readme.dm b/code/modules/research/rd-readme.dm index d1b8f77056c..2d4e354e2df 100644 --- a/code/modules/research/rd-readme.dm +++ b/code/modules/research/rd-readme.dm @@ -14,14 +14,13 @@ The major research and development is performed using a combination of four mach - R&D Console: A computer console that allows you to manipulate the other devices that are linked to it and view/manipulate the technologies you have researched so far. - Protolathe: Used to make new hand-held devices and parts for larger devices. All metals and reagents as raw materials. -- Destructive Analyzer: You can put hand-held objects into it and it'll analyze them for technological advancements but it destroys -them in the process. Destroyed items will send their raw materials to a linked Protolathe (if any) +- Scientific Analyzer: You can put hand-held objects into it and it'll analyze them for technological advancements - Circuit Imprinter: Similar to the Protolathe, it allows for the construction of circuit boards. Uses glass and acid as the raw materials. While researching you are dealing with two different types of information: Technology Paths and Device Designs. Technology Paths are the "Tech Trees" of the game. You start out with a number of them at the game start and they are improved by using the -Destructive Analyzer. By themselves, they don't do a whole lot. However, they unlock Device Designs. This is the information used +Scientific Analyzer. By themselves, they don't do a whole lot. However, they unlock Device Designs. This is the information used by the circuit imprinter and the protolathe to produce objects. //EXISTING TECH diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm index d0c6f0ccd87..877d5517e2c 100644 --- a/code/modules/research/rdconsole.dm +++ b/code/modules/research/rdconsole.dm @@ -1,7 +1,7 @@ /* Research and Development (R&D) Console -This is the main work horse of the R&D system. It contains the menus/controls for the Destructive Analyzer, Protolathe, and Circuit +This is the main work horse of the R&D system. It contains the menus/controls for the Scientific Analyzer, Protolathe, and Circuit imprinter. It also contains the /datum/research holder with all the known/possible technology paths and device designs. Basic use: When it first is created, it will attempt to link up to related devices within 3 squares. It'll only link up if they @@ -43,7 +43,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, #define MENU_MAIN 0 #define MENU_DISK 2 -#define MENU_DESTROY 3 +#define MENU_ANALYZER 3 #define MENU_LATHE 4 #define MENU_IMPRINTER 5 #define MENU_SETTINGS 6 @@ -69,8 +69,8 @@ won't update every console in existence) but it's more of a hassle to do. Also, var/obj/item/disk/tech_disk/t_disk = null /// Holder for the inserted design disk var/obj/item/disk/design_disk/d_disk = null - /// Linked destructive analyser - var/obj/machinery/r_n_d/destructive_analyzer/linked_destroy = null + /// Linked scientific analyser + var/obj/machinery/r_n_d/scientific_analyzer/linked_analyzer = null /// Linked protolathe var/obj/machinery/r_n_d/protolathe/linked_lathe = null /// Linked circuit imprinter @@ -128,9 +128,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(!isnull(D.linked_console) || D.panel_open) continue - if(istype(D, /obj/machinery/r_n_d/destructive_analyzer)) - if(linked_destroy == null) - linked_destroy = D + if(istype(D, /obj/machinery/r_n_d/scientific_analyzer)) + if(linked_analyzer == null) + linked_analyzer = D D.linked_console = src else if(istype(D, /obj/machinery/r_n_d/protolathe)) @@ -159,9 +159,9 @@ won't update every console in existence) but it's more of a hassle to do. Also, QDEL_NULL(t_disk) QDEL_NULL(d_disk) matching_designs.Cut() - if(linked_destroy) - linked_destroy.linked_console = null - linked_destroy = null + if(linked_analyzer) + linked_analyzer.linked_console = null + linked_analyzer = null if(linked_lathe) linked_lathe.linked_console = null linked_lathe = null @@ -196,7 +196,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, return D.loc = src to_chat(user, "You add the disk to the machine!") - else if(!(linked_destroy && linked_destroy.busy) && !(linked_lathe && linked_lathe.busy) && !(linked_imprinter && linked_imprinter.busy)) + else if(!(linked_analyzer && linked_analyzer.busy) && !(linked_lathe && linked_lathe.busy) && !(linked_imprinter && linked_imprinter.busy)) ..() SStgui.update_uis(src) return @@ -247,23 +247,23 @@ won't update every console in existence) but it's more of a hassle to do. Also, clear_wait_message() SStgui.update_uis(src) -/obj/machinery/computer/rdconsole/proc/start_destroyer(mob/user) - if(!linked_destroy) +/obj/machinery/computer/rdconsole/proc/start_analyzer_destroy(mob/user) + if(!linked_analyzer) return - if(linked_destroy.busy) - to_chat(user, "[linked_destroy] is busy at the moment.") + if(linked_analyzer.busy) + to_chat(user, "[linked_analyzer] is busy at the moment.") return - if(!linked_destroy.loaded_item) - to_chat(user, "[linked_destroy] appears to be empty.") + if(!linked_analyzer.loaded_item) + to_chat(user, "[linked_analyzer] appears to be empty.") return var/datum/research/files = get_files() if(!files) return - var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech) + var/list/temp_tech = linked_analyzer.ConvertReqString2List(linked_analyzer.loaded_item.origin_tech) var/pointless = FALSE for(var/T in temp_tech) @@ -273,63 +273,93 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(!pointless) var/choice = alert(user, "This item does not raise tech levels. Proceed destroying loaded item anyway?", "Are you sure you want to destroy this item?", "Proceed", "Cancel") - if(choice == "Cancel" || !linked_destroy) + if(choice == "Cancel" || !linked_analyzer) return - linked_destroy.busy = TRUE + linked_analyzer.busy = TRUE add_wait_message("Processing and Updating Database...", DECONSTRUCT_DELAY) - flick("d_analyzer_process", linked_destroy) - addtimer(CALLBACK(src, PROC_REF(finish_destroyer), user, temp_tech), DECONSTRUCT_DELAY) + flick("s_analyzer_process", linked_analyzer) + addtimer(CALLBACK(src, PROC_REF(finish_analyzer), user, temp_tech), DECONSTRUCT_DELAY) + + +/obj/machinery/computer/rdconsole/proc/start_analyzer_discover(mob/user) + if(!linked_analyzer) + return + + if(linked_analyzer.busy) + to_chat(user, "[linked_analyzer] is busy at the moment.") + return + + if(!linked_analyzer.loaded_item) + to_chat(user, "[linked_analyzer] appears to be empty.") + return + + if(!istype(linked_analyzer.loaded_item, /obj/item/relic)) + message_admins("[key_name_admin(user)] attempted to discover something that isnt a strange object. Possible HREF exploit.") + return + + var/obj/item/relic/R = linked_analyzer.loaded_item + visible_message("[linked_analyzer] scans [linked_analyzer.loaded_item], revealing its true nature!") + playsound(loc, 'sound/effects/supermatter.ogg', 50, 3, -1) + + // LETS GO GAMBLING + R.reveal() + R.forceMove(get_turf(linked_analyzer)) + linked_analyzer.loaded_item = null + investigate_log("Scientific analyser has revealed a relic with effect ID [R.function_id] effect.", "strangeobjects") + linked_analyzer.icon_state = "s_analyzer" + SStgui.update_uis(src) + // Sends salvaged materials to a linked protolathe, if any. /obj/machinery/computer/rdconsole/proc/send_mats() - if(!linked_lathe || !linked_destroy || !linked_destroy.loaded_item) + if(!linked_lathe || !linked_analyzer || !linked_analyzer.loaded_item) return - for(var/material in linked_destroy.loaded_item.materials) + for(var/material in linked_analyzer.loaded_item.materials) var/space = linked_lathe.materials.max_amount - linked_lathe.materials.total_amount // as item rating increases, amount salvageable increases - var/salvageable = linked_destroy.loaded_item.materials[material] * (linked_destroy.decon_mod / 10) + var/salvageable = linked_analyzer.loaded_item.materials[material] * (linked_analyzer.decon_mod / 10) // but you shouldn't salvage more than the raw materials amount - var/available = linked_destroy.loaded_item.materials[material] + var/available = linked_analyzer.loaded_item.materials[material] var/can_insert = min(space, salvageable, available) linked_lathe.materials.insert_amount(can_insert, material) -/obj/machinery/computer/rdconsole/proc/finish_destroyer(mob/user, list/temp_tech) +/obj/machinery/computer/rdconsole/proc/finish_analyzer(mob/user, list/temp_tech) clear_wait_message() - if(!linked_destroy || !temp_tech) + if(!linked_analyzer || !temp_tech) return var/datum/research/files = get_files() if(!files) return - if(!linked_destroy.loaded_item) - to_chat(user, "[linked_destroy] appears to be empty.") + if(!linked_analyzer.loaded_item) + to_chat(user, "[linked_analyzer] appears to be empty.") else for(var/T in temp_tech) files.UpdateTech(T, temp_tech[T]) send_mats() - linked_destroy.loaded_item = null + linked_analyzer.loaded_item = null - for(var/obj/I in linked_destroy.contents) + for(var/obj/I in linked_analyzer.contents) for(var/mob/M in I.contents) M.death() if(istype(I, /obj/item/stack))//Only deconstructs one item in a stack at a time instead of the entire stack var/obj/item/stack/S = I if(S.amount > 1) S.amount-- - linked_destroy.loaded_item = S + linked_analyzer.loaded_item = S else qdel(S) - linked_destroy.icon_state = "d_analyzer" - else if(!(I in linked_destroy.component_parts)) + linked_analyzer.icon_state = "s_analyzer" + else if(!(I in linked_analyzer.component_parts)) qdel(I) - linked_destroy.icon_state = "d_analyzer" + linked_analyzer.icon_state = "s_analyzer" - linked_destroy.busy = FALSE + linked_analyzer.busy = FALSE use_power(DECONSTRUCT_POWER) - menu = MENU_DESTROY + menu = MENU_ANALYZER SStgui.update_uis(src) @@ -590,18 +620,21 @@ won't update every console in existence) but it's more of a hassle to do. Also, if(design && d_disk && can_copy_design(design)) d_disk.blueprint = design - if("eject_item") //Eject the item inside the destructive analyzer. - if(linked_destroy) - if(linked_destroy.busy) - to_chat(ui.user, "[linked_destroy] is busy at the moment.") + if("eject_item") //Eject the item inside the scientific analyzer. + if(linked_analyzer) + if(linked_analyzer.busy) + to_chat(ui.user, "[linked_analyzer] is busy at the moment.") - else if(linked_destroy.loaded_item) - linked_destroy.loaded_item.forceMove(linked_destroy.loc) - linked_destroy.loaded_item = null - linked_destroy.icon_state = "d_analyzer" + else if(linked_analyzer.loaded_item) + linked_analyzer.loaded_item.forceMove(linked_analyzer.loc) + linked_analyzer.loaded_item = null + linked_analyzer.icon_state = "s_analyzer" - if("deconstruct") //Deconstruct the item in the destructive analyzer and update the research holder. - start_destroyer(ui.user) + if("deconstruct") //Deconstruct the item in the scientific analyzer and update the research holder. + start_analyzer_destroy(ui.user) + + if("discover") // Analyse the object in the scientific analyser and discover it + start_analyzer_discover(ui.user) if("build") //Causes the Protolathe to build something. start_machine(linked_lathe, params["id"], text2num(params["amount"])) @@ -637,10 +670,10 @@ won't update every console in existence) but it's more of a hassle to do. Also, if("disconnect") //The R&D console disconnects with a specific device. switch(params["item"]) - if("destroy") - if(linked_destroy) - linked_destroy.linked_console = null - linked_destroy = null + if("analyze") + if(linked_analyzer) + linked_analyzer.linked_console = null + linked_analyzer = null if("lathe") if(linked_lathe) linked_lathe.linked_console = null @@ -849,7 +882,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, data["wait_message"] = wait_message data["src_ref"] = UID() - data["linked_destroy"] = linked_destroy ? 1 : 0 + data["linked_analyzer"] = linked_analyzer ? 1 : 0 data["linked_lathe"] = linked_lathe ? 1 : 0 data["linked_imprinter"] = linked_imprinter ? 1 : 0 data["disk_type"] = d_disk ? "design" : (t_disk ? "tech" : null) @@ -933,11 +966,12 @@ won't update every console in existence) but it's more of a hassle to do. Also, material["name"] = CallMaterialName(M) material["amount"] = d_disk.blueprint.materials[M] - else if(menu == MENU_DESTROY && linked_destroy && linked_destroy.loaded_item) + else if(menu == MENU_ANALYZER && linked_analyzer && linked_analyzer.loaded_item) var/list/loaded_item_list = list() data["loaded_item"] = loaded_item_list - loaded_item_list["name"] = linked_destroy.loaded_item.name - var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech) + data["can_discover"] = istype(linked_analyzer.loaded_item, /obj/item/relic) + loaded_item_list["name"] = linked_analyzer.loaded_item.name + var/list/temp_tech = linked_analyzer.ConvertReqString2List(linked_analyzer.loaded_item.origin_tech) var/list/tech_levels = list() data["tech_levels"] = tech_levels for(var/v in files.known_tech) @@ -986,12 +1020,6 @@ won't update every console in existence) but it's more of a hassle to do. Also, desc = "A console used to interface with R&D tools." autolink_id = "station_rnd" -/obj/machinery/computer/rdconsole/experiment - name = "\improper E.X.P.E.R.I-MENTOR R&D console" - autolink_id = "station_rnd" - range = 5 - circuit = /obj/item/circuitboard/rdconsole/experiment - /obj/machinery/computer/rdconsole/public name = "public R&D console" req_one_access = list() @@ -1007,7 +1035,7 @@ won't update every console in existence) but it's more of a hassle to do. Also, #undef IMPRINTER_DELAY #undef MENU_MAIN #undef MENU_DISK -#undef MENU_DESTROY +#undef MENU_ANALYZER #undef MENU_LATHE #undef MENU_IMPRINTER #undef MENU_SETTINGS diff --git a/code/modules/research/destructive_analyzer.dm b/code/modules/research/scientific_analyzer.dm similarity index 66% rename from code/modules/research/destructive_analyzer.dm rename to code/modules/research/scientific_analyzer.dm index a84bb3b4f07..333cd5d0a3d 100644 --- a/code/modules/research/destructive_analyzer.dm +++ b/code/modules/research/scientific_analyzer.dm @@ -1,60 +1,60 @@ /* -Destructive Analyzer +Scientific Analyzer -It is used to destroy hand-held objects and advance technological research. Controls are in the linked R&D console. +It is used to analyze hand-held objects and advance technological research. Controls are in the linked R&D console. Note: Must be placed within 3 tiles of the R&D Console */ -/obj/machinery/r_n_d/destructive_analyzer - name = "Destructive Analyzer" - desc = "Learn science by destroying things!" - icon_state = "d_analyzer" +/obj/machinery/r_n_d/scientific_analyzer + name = "Scientific Analyzer" + desc = "Learn science by analyzing things!" + icon_state = "s_analyzer" var/decon_mod = 0 -/obj/machinery/r_n_d/destructive_analyzer/Initialize(mapload) +/obj/machinery/r_n_d/scientific_analyzer/Initialize(mapload) . = ..() component_parts = list() - component_parts += new /obj/item/circuitboard/destructive_analyzer(null) + component_parts += new /obj/item/circuitboard/scientific_analyzer(null) component_parts += new /obj/item/stock_parts/scanning_module(null) component_parts += new /obj/item/stock_parts/manipulator(null) component_parts += new /obj/item/stock_parts/micro_laser(null) RefreshParts() -/obj/machinery/r_n_d/destructive_analyzer/upgraded/Initialize(mapload) +/obj/machinery/r_n_d/scientific_analyzer/upgraded/Initialize(mapload) . = ..() component_parts = list() - component_parts += new /obj/item/circuitboard/destructive_analyzer(null) + component_parts += new /obj/item/circuitboard/scientific_analyzer(null) component_parts += new /obj/item/stock_parts/scanning_module/phasic(null) component_parts += new /obj/item/stock_parts/manipulator/pico(null) component_parts += new /obj/item/stock_parts/micro_laser/ultra(null) RefreshParts() -/obj/machinery/r_n_d/destructive_analyzer/Destroy() +/obj/machinery/r_n_d/scientific_analyzer/Destroy() if(linked_console) - linked_console.linked_destroy = null + linked_console.linked_analyzer = null return ..() -/obj/machinery/r_n_d/destructive_analyzer/RefreshParts() +/obj/machinery/r_n_d/scientific_analyzer/RefreshParts() var/T = 0 for(var/obj/item/stock_parts/S in component_parts) T += S.rating decon_mod = T -/obj/machinery/r_n_d/destructive_analyzer/proc/ConvertReqString2List(list/source_list) +/obj/machinery/r_n_d/scientific_analyzer/proc/ConvertReqString2List(list/source_list) var/list/temp_list = params2list(source_list) for(var/O in temp_list) temp_list[O] = text2num(temp_list[O]) return temp_list -/obj/machinery/r_n_d/destructive_analyzer/attackby__legacy__attackchain(obj/item/O as obj, mob/user as mob, params) +/obj/machinery/r_n_d/scientific_analyzer/attackby__legacy__attackchain(obj/item/O as obj, mob/user as mob, params) if(istype(O, /obj/item/storage/part_replacer)) return ..() - if(default_deconstruction_screwdriver(user, "d_analyzer_t", "d_analyzer", O)) + if(default_deconstruction_screwdriver(user, "s_analyzer_t", "s_analyzer", O)) if(linked_console) - linked_console.linked_destroy = null + linked_console.linked_analyzer = null linked_console = null return @@ -91,7 +91,7 @@ Note: Must be placed within 3 tiles of the R&D Console O.loc = src to_chat(user, "You add [O] to [src]!") SStgui.update_uis(linked_console) - flick("d_analyzer_la", src) + flick("s_analyzer_la", src) spawn(10) - icon_state = "d_analyzer_l" + icon_state = "s_analyzer_l" busy = FALSE diff --git a/code/modules/research/strange_objects.dm b/code/modules/research/strange_objects.dm index 2be7bdc81ee..f8f0bdbee8d 100644 --- a/code/modules/research/strange_objects.dm +++ b/code/modules/research/strange_objects.dm @@ -57,6 +57,10 @@ /mob/living/carbon/human/monkey, ) + // Assign it a random tech level + var/list/possible_techs = list("materials", "engineering", "plasmatech", "powerstorage", "bluespace", "biotech", "combat", "magnets", "programming") + origin_tech = "[pick(possible_techs)]=[rand(2, 5)]" + /obj/item/relic/proc/reveal() if(revealed) //Re-rolling your relics seems a bit overpowered, yes? @@ -76,13 +80,8 @@ STRANGEOBJECT_FUNCTION_PET_SPAWN, ) - origin_tech = pick( - "engineering=[rand(2,5)]", - "magnets=[rand(2,5)]", - "plasmatech=[rand(2,5)]", - "programming=[rand(2,5)]", - "powerstorage=[rand(2,5)]", - ) + // You discovered it - you gambled your possible fortune! AW DANGIT! + origin_tech = null /obj/item/relic/attack_self__legacy__attackchain(mob/user) @@ -199,7 +198,7 @@ message_admins("[RelicType] relic activated by [key_name_admin(user)] in ([T.x], [T.y], [T.z] - JMP)",0,1) log_game(log_msg) - investigate_log(log_msg, "experimentor") + investigate_log(log_msg, "strangeobjects") // Make some magic smoke diff --git a/icons/obj/machines/research.dmi b/icons/obj/machines/research.dmi index f5a8c080bb7..58499d761bc 100644 Binary files a/icons/obj/machines/research.dmi and b/icons/obj/machines/research.dmi differ diff --git a/paradise.dme b/paradise.dme index 2028cf966b9..705d466b263 100644 --- a/paradise.dme +++ b/paradise.dme @@ -2585,7 +2585,6 @@ #include "code\modules\pda\cart_apps.dm" #include "code\modules\pda\core_apps.dm" #include "code\modules\pda\games.dm" -#include "code\modules\pda\games\minesweeper.dm" #include "code\modules\pda\messenger.dm" #include "code\modules\pda\messenger_plugins.dm" #include "code\modules\pda\nanobank.dm" @@ -2593,6 +2592,7 @@ #include "code\modules\pda\pda_tgui.dm" #include "code\modules\pda\pdas.dm" #include "code\modules\pda\utilities.dm" +#include "code\modules\pda\games\minesweeper.dm" #include "code\modules\persistence\persistence.dm" #include "code\modules\point\point.dm" #include "code\modules\power\cell.dm" @@ -2753,8 +2753,6 @@ #include "code\modules\research\backup_console.dm" #include "code\modules\research\circuitprinter.dm" #include "code\modules\research\designs.dm" -#include "code\modules\research\destructive_analyzer.dm" -#include "code\modules\research\experimentor.dm" #include "code\modules\research\message_server.dm" #include "code\modules\research\protolathe.dm" #include "code\modules\research\rd-readme.dm" @@ -2762,6 +2760,7 @@ #include "code\modules\research\rdmachines.dm" #include "code\modules\research\research.dm" #include "code\modules\research\rnd_network_controller.dm" +#include "code\modules\research\scientific_analyzer.dm" #include "code\modules\research\server.dm" #include "code\modules\research\strange_objects.dm" #include "code\modules\research\anomaly\anomaly.dm" diff --git a/tgui/packages/tgui/interfaces/RndConsole/DeconstructionMenu.js b/tgui/packages/tgui/interfaces/RndConsole/AnalyzerMenu.js similarity index 80% rename from tgui/packages/tgui/interfaces/RndConsole/DeconstructionMenu.js rename to tgui/packages/tgui/interfaces/RndConsole/AnalyzerMenu.js index 477bd787836..c4359033771 100644 --- a/tgui/packages/tgui/interfaces/RndConsole/DeconstructionMenu.js +++ b/tgui/packages/tgui/interfaces/RndConsole/AnalyzerMenu.js @@ -2,17 +2,17 @@ import { classes } from 'common/react'; import { useBackend } from '../../backend'; import { Button, Icon, LabeledList, Section, Table } from '../../components'; -export const DeconstructionMenu = (props, context) => { +export const AnalyzerMenu = (props, context) => { const { data, act } = useBackend(context); - const { tech_levels, loaded_item, linked_destroy } = data; + const { tech_levels, loaded_item, linked_analyzer, can_discover } = data; - if (!linked_destroy) { - return
NO DESTRUCTIVE ANALYZER LINKED TO CONSOLE
; + if (!linked_analyzer) { + return
NO SCIENTIFIC ANALYZER LINKED TO CONSOLE
; } if (!loaded_item) { - return
No item loaded. Standing by...
; + return
No item loaded. Standing by...
; } return ( @@ -35,6 +35,15 @@ export const DeconstructionMenu = (props, context) => { act('eject_item'); }} /> + {!can_discover || ( +