diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index e9e8ef43fb35c..7a73b04e23595 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -2108,16 +2108,6 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/fore) -"aFt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/advanced_airlock_controller{ - dir = 1; - pixel_y = 25 - }, -/turf/open/floor/catwalk_floor, -/area/engine/atmos) "aFu" = ( /turf/closed/wall, /area/library) @@ -4336,8 +4326,8 @@ /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "aYf" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/disposalpipe/junction/flip{ + dir = 8 }, /turf/open/floor/plating, /area/maintenance/port) @@ -4857,6 +4847,9 @@ /obj/item/clothing/head/soft/rainbow, /obj/item/clothing/shoes/sneakers/rainbow, /obj/item/clothing/under/color/rainbow, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "bee" = ( @@ -4936,6 +4929,24 @@ /obj/machinery/light, /turf/open/floor/iron, /area/hallway/primary/starboard) +"beF" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "beM" = ( /obj/structure/chair{ dir = 1 @@ -5192,7 +5203,9 @@ /turf/open/floor/iron, /area/quartermaster/office) "bgB" = ( -/obj/structure/disposalpipe/segment, +/obj/structure/disposalpipe/sorting/unsorted/flip{ + dir = 1 + }, /turf/closed/wall, /area/quartermaster/sorting) "bgF" = ( @@ -5228,9 +5241,6 @@ /area/engine/gravity_generator) "bgZ" = ( /obj/machinery/stasis, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -5241,6 +5251,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/light{ + dir = 1 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "bhh" = ( @@ -6527,12 +6540,10 @@ "bqR" = ( /obj/structure/table/glass, /obj/item/storage/backpack/duffelbag/med/surgery, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 8 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/iron/white, /area/medical/sleeper) "bqS" = ( @@ -6671,7 +6682,9 @@ /area/medical/sleeper) "bsK" = ( /obj/structure/closet/secure_closet/hop, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -8050,6 +8063,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/corner, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/iron, /area/science/mixing) "bHv" = ( @@ -8116,7 +8132,6 @@ dir = 1 }, /obj/item/kirbyplants/random, -/obj/machinery/camera/directional/north, /turf/open/floor/iron, /area/hallway/secondary/entry) "bIm" = ( @@ -8546,7 +8561,7 @@ dir = 4 }, /obj/machinery/camera/preset/toxins{ - dir = 8 + dir = 4 }, /turf/open/floor/plating{ initial_gas_mix = "o2=0.01;n2=0.01;TEMP=293.15"; @@ -10603,17 +10618,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"bWU" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/orange/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/engine/atmos) "bWX" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -11682,9 +11686,6 @@ /turf/open/floor/engine/co2, /area/engine/atmos) "ccE" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -11986,9 +11987,6 @@ /turf/open/floor/iron/white, /area/science/robotics/lab) "ceB" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 6 }, @@ -12017,9 +12015,6 @@ /turf/open/floor/iron/dark, /area/hallway/secondary/command) "ceI" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -12662,7 +12657,6 @@ /turf/open/floor/iron, /area/hallway/primary/central) "cjA" = ( -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/white, @@ -12873,6 +12867,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"clI" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/aft) "clJ" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -13059,7 +13062,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /turf/open/floor/carpet, /area/quartermaster/exploration_prep) "cnr" = ( @@ -13305,6 +13310,10 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/south{ + areastring = "/area/engine/supermatter" + }, +/obj/structure/cable/yellow, /turf/open/floor/engine, /area/engine/engineering) "cqj" = ( @@ -13897,6 +13906,9 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"ctl" = ( +/turf/open/floor/catwalk_floor, +/area/maintenance/aft) "ctn" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -14084,7 +14096,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -14243,7 +14257,9 @@ /turf/open/floor/plating, /area/maintenance/aft) "cwx" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -15537,6 +15553,9 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, +/obj/machinery/camera/autoname/directional/north{ + network = list("ss13","engine") + }, /turf/open/floor/engine, /area/engine/engineering) "cFR" = ( @@ -16145,7 +16164,9 @@ /area/quartermaster/exploration_dock) "cKv" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/item/stack/package_wrap, /obj/structure/table/wood, @@ -16173,6 +16194,21 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"cLh" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/engine, +/area/engine/engineering) "cLp" = ( /obj/structure/railing{ dir = 8 @@ -16194,6 +16230,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/spawner/lootdrop/grille_or_trash, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "cMm" = ( @@ -16759,9 +16798,7 @@ /turf/open/floor/engine, /area/science/explab) "cWC" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, +/obj/machinery/airalarm/directional/east, /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/closet/secure_closet/engineering_personal, /turf/open/floor/iron, @@ -16803,12 +16840,6 @@ }, /turf/open/floor/iron/dark, /area/security/prison) -"cZd" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/atmos) "cZt" = ( /obj/machinery/door/airlock{ name = "Theatre Backstage"; @@ -17125,7 +17156,9 @@ /area/science/research) "dgq" = ( /obj/structure/closet/secure_closet/security/med, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -17359,12 +17392,6 @@ /obj/machinery/status_display/evac{ pixel_x = 32 }, -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, -/obj/machinery/status_display/evac{ - pixel_x = 32 - }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "dmK" = ( @@ -17732,12 +17759,17 @@ name = "Dormitories Maintenance"; req_access_txt = "12" }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "dvS" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 4 }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable/yellow, /turf/open/floor/plating, /area/maintenance/aft) "dvV" = ( @@ -17791,7 +17823,9 @@ /turf/open/floor/iron, /area/security/brig) "dwp" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -17823,12 +17857,6 @@ }, /turf/open/floor/iron, /area/security/checkpoint/engineering) -"dwY" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, -/turf/open/floor/plating, -/area/engine/atmos) "dxd" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /obj/structure/cable/yellow{ @@ -18029,14 +18057,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"dBW" = ( -/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, -/turf/open/floor/iron, -/area/engine/atmos) "dCJ" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -18954,7 +18974,9 @@ /turf/open/floor/iron/white, /area/medical/sleeper) "dUa" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -19416,9 +19438,6 @@ /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/hallway) "ede" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, @@ -19656,6 +19675,7 @@ /obj/effect/turf_decal/tile/brown/anticorner/contrasted{ dir = 1 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron, /area/quartermaster/qm) "eiC" = ( @@ -20177,9 +20197,6 @@ "etZ" = ( /obj/structure/table/glass, /obj/item/storage/belt/medical, -/obj/machinery/light{ - dir = 8 - }, /obj/item/storage/box/medipens, /obj/effect/turf_decal/tile/blue{ dir = 8 @@ -20374,7 +20391,9 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) "eye" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -20384,7 +20403,9 @@ /turf/open/floor/iron/white, /area/medical/genetics) "eyf" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -20967,6 +20988,24 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"eKr" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "eLa" = ( /obj/machinery/door/poddoor/preopen{ id = "bridgeentrance"; @@ -21076,6 +21115,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "eMZ" = ( @@ -21759,6 +21801,21 @@ }, /turf/open/floor/iron, /area/security/courtroom) +"faE" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "fbS" = ( /obj/structure/table, /obj/item/storage/box/chemimp{ @@ -21875,7 +21932,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron, /area/hallway/primary/fore) "ffm" = ( @@ -21986,6 +22045,9 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "fhv" = ( @@ -22140,9 +22202,6 @@ /turf/open/floor/iron/grid/steel, /area/gateway) "fkv" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -22150,6 +22209,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, +/obj/structure/disposalpipe/junction{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "fkM" = ( @@ -22417,7 +22479,6 @@ /area/library) "fsG" = ( /obj/structure/bed/roller, -/obj/structure/bed/roller, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 9 @@ -22543,6 +22604,15 @@ }, /turf/open/floor/prison, /area/security/prison) +"fvo" = ( +/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/aft) "fwG" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 8 @@ -22602,6 +22672,12 @@ }, /turf/open/floor/iron/dark, /area/security/main) +"fya" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/turf/open/floor/plating, +/area/maintenance/aft) "fyc" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /obj/effect/decal/cleanable/dirt, @@ -22766,6 +22842,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "fBh" = ( @@ -22938,7 +23015,9 @@ /area/engine/atmos) "fEN" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -23498,11 +23577,11 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 }, /obj/structure/disposalpipe/segment{ - dir = 6 + dir = 4 }, /turf/open/floor/iron, /area/crew_quarters/fitness) @@ -23661,7 +23740,6 @@ /turf/open/floor/iron, /area/science/storage) "fUY" = ( -/obj/machinery/light/small, /obj/machinery/advanced_airlock_controller{ pixel_y = 24 }, @@ -23671,6 +23749,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/light/small/directional/north, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "fVk" = ( @@ -24362,12 +24441,10 @@ /area/maintenance/starboard/aft) "gkL" = ( /obj/machinery/washing_machine, -/obj/machinery/light/small{ - dir = 4 - }, /obj/effect/turf_decal/stripes/line{ dir = 5 }, +/obj/machinery/light/small/directional/west, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) "gkT" = ( @@ -24538,6 +24615,12 @@ }, /turf/open/floor/prison, /area/security/prison) +"goV" = ( +/obj/machinery/camera/directional/north{ + network = list("ss13","rd") + }, +/turf/open/floor/engine, +/area/science/explab) "goW" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/plating, @@ -24582,6 +24665,16 @@ }, /turf/open/floor/iron/white, /area/medical/virology) +"gqr" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/maintenance/glass{ + name = "Atmospherics External Airlock"; + req_access_txt = "24" + }, +/turf/open/floor/iron, +/area/maintenance/aft) "gqv" = ( /obj/machinery/light/small{ dir = 1 @@ -24770,6 +24863,18 @@ }, /turf/open/floor/carpet, /area/hallway/secondary/entry) +"gtR" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "gui" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -25106,11 +25211,7 @@ dir = 4; pixel_x = -24 }, -/obj/structure/sink{ - dir = 8; - pixel_x = -12; - pixel_y = 2 - }, +/obj/effect/turf_decal/loading_area, /turf/open/floor/iron/white, /area/medical/virology) "gCm" = ( @@ -25241,6 +25342,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/iron, /area/science/mixing) "gEs" = ( @@ -25657,6 +25761,18 @@ "gQd" = ( /turf/closed/wall, /area/quartermaster/exploration_dock) +"gQG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "gQJ" = ( /obj/machinery/power/solar{ id = "portsolar"; @@ -25947,6 +26063,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, /turf/open/floor/iron, /area/science/mixing) "gZG" = ( @@ -25986,6 +26105,17 @@ }, /turf/open/floor/iron, /area/hallway/primary/starboard) +"haj" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos_external" + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible, +/turf/open/floor/plating, +/area/maintenance/aft) "haz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -26544,6 +26674,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "hnD" = ( @@ -26886,7 +27022,9 @@ /turf/open/floor/iron, /area/engine/atmos) "hwq" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -27935,6 +28073,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "hRX" = ( @@ -27977,6 +28118,19 @@ }, /turf/open/floor/iron/dark/telecomms, /area/tcommsat/server) +"hSt" = ( +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "13" + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos_external" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "hSv" = ( /obj/machinery/light, /obj/machinery/airalarm/directional/south, @@ -28465,7 +28619,9 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /turf/open/floor/wood, /area/lawoffice) "icf" = ( @@ -29032,9 +29188,6 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "imi" = ( -/obj/machinery/light/small{ - dir = 1 - }, /obj/machinery/advanced_airlock_controller{ dir = 1; pixel_y = -24 @@ -29045,6 +29198,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 }, +/obj/machinery/light/small/directional/south, /turf/open/floor/catwalk_floor, /area/hallway/secondary/exit) "imn" = ( @@ -29385,6 +29539,16 @@ }, /turf/open/floor/iron, /area/hallway/primary/fore) +"iui" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/advanced_airlock_controller{ + dir = 1; + pixel_y = 25 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/aft) "iuA" = ( /obj/effect/turf_decal/bot_white/right, /turf/open/floor/engine/light, @@ -30286,7 +30450,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron, /area/hallway/primary/port) "iPN" = ( @@ -30426,6 +30592,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "iRw" = ( @@ -30588,8 +30757,26 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"iVk" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/barricade/wooden/crude, +/obj/machinery/door/airlock/maintenance{ + id_tag = "commissarydoor"; + req_one_access_txt = "12;63;48;50" + }, +/obj/effect/mapping_helpers/airlock/abandoned, +/turf/open/floor/plating, +/area/maintenance/port) "iVN" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 @@ -31302,6 +31489,12 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"jlW" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "jmC" = ( /obj/structure/table, /obj/item/crowbar/large, @@ -31406,9 +31599,6 @@ pixel_x = -5; pixel_y = 30 }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, @@ -31513,16 +31703,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"jsS" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light/small{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/secondary/exit) "jsT" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -31654,12 +31834,10 @@ /obj/structure/cable/yellow{ icon_state = "1-8" }, -/obj/structure/disposalpipe/sorting/mail{ - sortType = 24 - }, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 4 }, +/obj/structure/disposalpipe/junction, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -32458,6 +32636,9 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "jMr" = ( @@ -32684,6 +32865,9 @@ /area/engine/atmos) "jRJ" = ( /obj/machinery/vending/boozeomat, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "jSj" = ( @@ -32869,9 +33053,6 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "jVS" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, @@ -33038,7 +33219,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 9 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -34077,7 +34260,9 @@ /area/crew_quarters/dorms) "kyJ" = ( /obj/structure/filingcabinet, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -34102,6 +34287,12 @@ }, /turf/open/floor/iron/dark/telecomms, /area/science/server) +"kzn" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/plating, +/area/maintenance/port) "kzD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/door/firedoor, @@ -34335,7 +34526,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron, /area/hallway/secondary/service) "kEM" = ( @@ -34675,14 +34868,18 @@ /obj/structure/table/wood, /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, /turf/open/floor/wood, /area/crew_quarters/bar) "kLd" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -34940,9 +35137,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/light{ - dir = 1 - }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, @@ -35163,6 +35357,9 @@ /area/chapel/office) "kUw" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/machinery/light{ + dir = 4 + }, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -35267,12 +35464,7 @@ /turf/open/floor/iron/white, /area/medical/genetics) "kWa" = ( -/obj/structure/disposaloutlet, /obj/structure/disposalpipe/segment, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -35905,15 +36097,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/fore/secondary) -"llQ" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/catwalk_floor, -/area/engine/atmos) "lme" = ( /obj/effect/spawner/randomvend/cola, /turf/open/floor/wood, @@ -36046,6 +36229,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "lnP" = ( @@ -36255,6 +36441,9 @@ name = "Security Junction"; sortType = 7 }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "lrg" = ( @@ -36384,6 +36573,10 @@ pixel_x = 24; req_access_txt = "39" }, +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, /turf/open/floor/iron/white, /area/medical/virology) "lvx" = ( @@ -36914,12 +37107,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/aft) -"lFf" = ( -/obj/machinery/light{ - dir = 4 - }, -/turf/open/floor/iron/cafeteria_red, -/area/crew_quarters/bar) "lFJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -37366,7 +37553,9 @@ /turf/open/floor/plating, /area/crew_quarters/heads/captain) "lTj" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -37424,11 +37613,6 @@ }, /turf/open/floor/iron/white, /area/science/explab) -"lUF" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/turf/open/floor/plating, -/area/maintenance/aft) "lUH" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -37552,7 +37736,7 @@ "lYs" = ( /obj/structure/lattice, /obj/machinery/camera/autoname/directional/east{ - network = list("ss13", "minisat") + network = list("ss13","minisat") }, /turf/open/space, /area/space/nearstation) @@ -37664,7 +37848,9 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron, /area/quartermaster/warehouse) "mbn" = ( @@ -38636,7 +38822,9 @@ /obj/structure/table, /obj/item/clothing/head/soft/cargo, /obj/item/clothing/head/soft/cargo, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -38718,7 +38906,9 @@ /turf/open/floor/engine, /area/engine/engineering) "mBJ" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/machinery/camera/autoname/directional/south, /turf/open/floor/plating, @@ -38754,7 +38944,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/item/multitool, /turf/open/floor/iron/dark, /area/security/warden) @@ -38966,7 +39158,9 @@ /area/teleporter) "mGR" = ( /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/effect/turf_decal/trimline/yellow/filled/line{ dir = 4 }, @@ -38985,12 +39179,6 @@ }, /turf/closed/wall, /area/maintenance/starboard/aft) -"mHc" = ( -/obj/machinery/light/small{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/starboard/aft) "mHx" = ( /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, @@ -39427,7 +39615,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/plating, /area/storage/emergency/port) "mSs" = ( @@ -39496,6 +39686,13 @@ }, /turf/open/floor/iron, /area/medical/genetics) +"mUT" = ( +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/machinery/camera/directional/south, +/turf/open/floor/iron/white/corner, +/area/hallway/secondary/entry) "mUU" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -40066,6 +40263,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "nfd" = ( @@ -40264,7 +40464,9 @@ "nkv" = ( /obj/machinery/vending/wardrobe/sec_wardrobe, /obj/structure/cable/yellow, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 }, @@ -40429,7 +40631,6 @@ pixel_x = -22; pixel_y = 1 }, -/obj/effect/turf_decal/loading_area, /obj/machinery/airalarm/directional/west{ pixel_x = -32 }, @@ -40741,6 +40942,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "nuK" = ( @@ -41043,7 +41247,9 @@ /turf/open/floor/carpet, /area/hallway/secondary/entry) "nCl" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/item/kirbyplants/random, /turf/open/floor/iron, @@ -41236,7 +41442,9 @@ /obj/item/screwdriver, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/black/fourcorners, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -41481,8 +41689,7 @@ /turf/open/floor/wood, /area/library) "nJp" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/machinery/camera/directional/east, /turf/open/floor/iron, /area/hallway/primary/central) "nJq" = ( @@ -41494,7 +41701,9 @@ /area/crew_quarters/heads/hop) "nJy" = ( /obj/structure/closet, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/machinery/airalarm/directional/south, /turf/open/floor/plating, @@ -41533,6 +41742,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/visible{ dir = 8 }, +/obj/machinery/light/directional/west, /turf/open/floor/iron/dark/side{ dir = 8 }, @@ -41591,7 +41801,9 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet) @@ -41812,6 +42024,9 @@ dir = 6 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "nQy" = ( @@ -42196,6 +42411,9 @@ pixel_x = -4; pixel_y = -3 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "nYz" = ( @@ -42734,7 +42952,9 @@ /turf/open/floor/iron/dark, /area/bridge) "okQ" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -42816,7 +43036,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron, @@ -42968,7 +43190,9 @@ /area/ai_monitored/turret_protected/aisat/service) "ore" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -43246,7 +43470,9 @@ /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat_interior) "owQ" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -43269,7 +43495,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -43296,7 +43524,9 @@ /obj/structure/cable/yellow{ icon_state = "0-4" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) "ozl" = ( @@ -43377,13 +43607,6 @@ /mob/living/basic/cockroach, /turf/open/floor/wood, /area/vacant_room/office) -"oAh" = ( -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/engine/atmos) "oAt" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, @@ -43745,7 +43968,9 @@ /obj/structure/bodycontainer/crematorium{ id = "crematoriumChapel" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -43950,7 +44175,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/blue, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -43974,6 +44201,9 @@ dir = 8 }, /obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "oPg" = ( @@ -44019,7 +44249,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 10 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -44073,6 +44305,9 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) +"oSu" = ( +/turf/closed/wall/r_wall, +/area/maintenance/aft) "oSH" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -44736,7 +44971,9 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8; name = "output gas connector port" @@ -44838,7 +45075,9 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/warning{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -44855,13 +45094,6 @@ /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/exploration_prep) -"pmV" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/aft) "pnh" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 @@ -45152,6 +45384,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, /turf/open/floor/plating, /area/maintenance/port) "prA" = ( @@ -45227,7 +45462,9 @@ /area/ai_monitored/security/armory) "psy" = ( /obj/machinery/iv_drip, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -45299,9 +45536,10 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "ptW" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, -/obj/machinery/light, /obj/structure/table/glass, /obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/reagent_containers/glass/beaker/cryoxadone{ @@ -45707,7 +45945,9 @@ pixel_x = 2; pixel_y = 2 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /turf/open/floor/iron/white, /area/science/explab) @@ -45839,6 +46079,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/hallway/primary/fore) "pEC" = ( @@ -46091,17 +46334,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/science/robotics/lab) -"pJZ" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "atmos_external" - }, -/obj/machinery/atmospherics/pipe/layer_manifold/visible, -/turf/open/floor/plating, -/area/engine/atmos) "pKd" = ( /obj/machinery/door/airlock/maintenance{ name = "Kitchen Maintenance"; @@ -46219,9 +46451,6 @@ /obj/machinery/airalarm/directional/north{ pixel_y = 23 }, -/obj/machinery/light{ - dir = 1 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -46352,7 +46581,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -46417,7 +46648,9 @@ /turf/open/floor/iron, /area/quartermaster/storage) "pSy" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -46546,8 +46779,8 @@ /turf/open/floor/iron, /area/security/brig) "pVb" = ( -/obj/structure/disposalpipe/junction/yjunction{ - dir = 4 +/obj/structure/disposalpipe/segment{ + dir = 6 }, /turf/closed/wall, /area/quartermaster/sorting) @@ -46584,7 +46817,9 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -46625,6 +46860,9 @@ /obj/effect/turf_decal/stripes/closeup{ dir = 1 }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "pWy" = ( @@ -47111,6 +47349,9 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "qkq" = ( @@ -47364,9 +47605,6 @@ id = "quarantineshutters"; name = "isolation shutters" }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /turf/open/floor/iron/white, /area/medical/virology) "qqM" = ( @@ -47746,9 +47984,6 @@ /obj/machinery/computer/cargo{ dir = 4 }, -/obj/machinery/light{ - dir = 8 - }, /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 }, @@ -47838,7 +48073,9 @@ /turf/open/floor/iron, /area/quartermaster/qm) "qBA" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/effect/turf_decal/tile/red/anticorner/contrasted, /turf/open/floor/iron/dark, @@ -47907,7 +48144,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /turf/open/floor/iron, /area/crew_quarters/locker) "qCJ" = ( @@ -48409,9 +48648,6 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"qNf" = ( -/turf/open/floor/catwalk_floor, -/area/engine/atmos) "qNw" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -48560,9 +48796,6 @@ /turf/open/floor/iron, /area/security/brig) "qSx" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, @@ -49068,9 +49301,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, /turf/open/floor/iron, /area/crew_quarters/fitness) "rcC" = ( @@ -49204,7 +49434,9 @@ /area/ai_monitored/turret_protected/aisat/atmos) "rdF" = ( /obj/machinery/light, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -49538,7 +49770,9 @@ /area/gateway) "riO" = ( /obj/machinery/telecomms/receiver/preset_exploration, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 9 @@ -49807,6 +50041,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/white/corner{ dir = 1 }, @@ -50664,6 +50899,9 @@ dir = 1 }, /obj/structure/disposalpipe/segment, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "rHU" = ( @@ -51032,9 +51270,12 @@ /turf/open/floor/catwalk_floor/iron, /area/engine/gravity_generator) "rPX" = ( -/obj/structure/disposalpipe/segment, -/turf/closed/wall, -/area/maintenance/port) +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/turf/open/floor/plating, +/area/maintenance/fore) "rQp" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/closet/firecloset, @@ -51153,12 +51394,13 @@ /turf/open/floor/iron, /area/science/explab) "rRQ" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/effect/turf_decal/tile/brown{ + dir = 8 }, -/obj/machinery/camera/directional/north, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron, -/area/hallway/primary/port) +/area/hallway/primary/central) "rRU" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -51274,6 +51516,8 @@ dir = 8 }, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/science/mixing) "rUj" = ( @@ -51376,6 +51620,9 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "rWK" = ( @@ -51484,7 +51731,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron, /area/hydroponics) "rYU" = ( @@ -51659,6 +51908,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/quartermaster/storage) +"sdl" = ( +/obj/machinery/light/small, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/catwalk_floor, +/area/maintenance/aft) "sdq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -53419,7 +53675,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -53800,7 +54058,9 @@ /obj/structure/cable/yellow{ icon_state = "0-2" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) "sVT" = ( @@ -53856,7 +54116,9 @@ /turf/open/floor/iron, /area/hallway/primary/port) "sXR" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -53902,7 +54164,6 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -54009,19 +54270,6 @@ /obj/machinery/digital_clock/directional/east, /turf/open/floor/iron, /area/engine/break_room) -"tbv" = ( -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "13" - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "atmos_external" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/plating, -/area/engine/atmos) "tcd" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -54442,15 +54690,6 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"thV" = ( -/obj/machinery/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/medical/sleeper) "thW" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ @@ -54475,6 +54714,12 @@ }, /turf/open/floor/iron/white, /area/medical/chemistry) +"tiP" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "tjb" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable/yellow{ @@ -54562,7 +54807,9 @@ /turf/open/floor/iron, /area/hallway/primary/aft) "tln" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -55259,7 +55506,12 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/turf/open/floor/iron, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/delivery, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark, /area/crew_quarters/dorms) "tAf" = ( /obj/machinery/light/small, @@ -55381,9 +55633,6 @@ /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 }, -/obj/machinery/camera/autoname/directional/north{ - network = list("ss13","engine") - }, /turf/open/floor/iron/dark, /area/engine/engineering) "tCh" = ( @@ -55501,12 +55750,6 @@ pixel_x = -31 }, /obj/item/clothing/head/utility/hardhat/cakehat, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, -/obj/machinery/computer/security/telescreen/entertainment{ - pixel_x = -31 - }, /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "tEr" = ( @@ -55932,7 +56175,9 @@ "tLN" = ( /obj/structure/table, /obj/item/paper_bin, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -56208,7 +56453,9 @@ }, /area/science/research) "tSr" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -56481,7 +56728,6 @@ /turf/open/floor/iron, /area/engine/engineering) "tYh" = ( -/obj/machinery/light, /obj/machinery/atmospherics/components/binary/pump/on{ dir = 1; name = "N2 Outlet Pump" @@ -56548,6 +56794,9 @@ /obj/machinery/light_switch{ pixel_x = -28 }, +/obj/machinery/light{ + dir = 8 + }, /turf/open/floor/iron/white, /area/medical/sleeper) "tZA" = ( @@ -56603,12 +56852,12 @@ /turf/open/floor/iron/dark, /area/science/nanite) "ubL" = ( -/obj/machinery/camera/autoname/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/white/side{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/area/science/research) +/obj/machinery/camera/directional/south, +/turf/open/floor/iron, +/area/hallway/primary/port) "ubO" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -56639,12 +56888,10 @@ /turf/open/floor/wood, /area/security/detectives_office) "ucv" = ( -/obj/effect/turf_decal/delivery, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 8 }, -/turf/open/floor/iron/dark, +/turf/open/floor/iron, /area/crew_quarters/fitness) "ucP" = ( /obj/effect/turf_decal/tile/blue{ @@ -56853,6 +57100,9 @@ dir = 1 }, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "ugE" = ( @@ -57337,7 +57587,9 @@ /obj/structure/table, /obj/item/storage/crayons, /obj/item/storage/crayons, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /turf/open/floor/iron, /area/storage/art) @@ -57381,7 +57633,9 @@ /turf/open/floor/plating, /area/maintenance/solars/starboard/aft) "urY" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -57407,15 +57661,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/science/xenobiology) -"usy" = ( -/obj/machinery/atmospherics/components/binary/dp_vent_pump/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/engine/atmos) "usC" = ( /obj/structure/table, /obj/machinery/vending/wallmed{ @@ -57838,9 +58083,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/light/small{ dir = 1 }, @@ -57928,8 +58170,8 @@ "uGr" = ( /obj/machinery/gibber, /obj/machinery/airalarm/kitchen_cold_room{ - pixel_x = 22; - dir = 4 + dir = 4; + pixel_x = 22 }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) @@ -58040,6 +58282,9 @@ /obj/structure/sign/departments/minsky/engineering/atmospherics{ pixel_y = -32 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/plating, /area/maintenance/fore/secondary) "uJd" = ( @@ -58099,6 +58344,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"uKA" = ( +/obj/machinery/atmospherics/pipe/simple/orange/visible/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible/layer4, +/turf/open/floor/iron, +/area/maintenance/aft) "uKS" = ( /obj/structure/chair/fancy/comfy{ color = "#666666"; @@ -58778,7 +59031,9 @@ /turf/open/floor/iron, /area/hallway/primary/central) "vci" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -59251,6 +59506,9 @@ dir = 8 }, /obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, /turf/open/floor/iron, /area/science/mixing) "vmB" = ( @@ -59333,6 +59591,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/prison) +"vnq" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment, +/turf/open/floor/plating, +/area/maintenance/aft) "vnK" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/lattice/catwalk, @@ -59363,8 +59626,8 @@ "vog" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/machinery/atmospherics/components/binary/pump{ - name = "Mix to Engine"; - dir = 4 + dir = 4; + name = "Mix to Engine" }, /turf/open/floor/iron, /area/engine/atmos) @@ -59620,6 +59883,13 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/dark, /area/hydroponics) +"vvL" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/apc/auto_name/directional/east, +/turf/open/floor/plating, +/area/maintenance/fore/secondary) "vvN" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -59825,7 +60095,9 @@ /obj/structure/rack, /obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted, /obj/item/storage/firstaid/regular, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/machinery/light_switch{ pixel_y = -26 @@ -59996,8 +60268,8 @@ "vGm" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/machinery/atmospherics/components/binary/pump{ - name = "N2 to Pure"; - dir = 1 + dir = 1; + name = "N2 to Pure" }, /turf/open/floor/iron/dark/side, /area/engine/atmos) @@ -60024,7 +60296,9 @@ dir = 1 }, /obj/structure/cable/yellow, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /turf/open/floor/iron/freezer, /area/crew_quarters/toilet/locker) "vGV" = ( @@ -60275,7 +60549,9 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "vLK" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -60549,11 +60825,13 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/sorting/mail/flip{ + sortType = 24 + }, /turf/open/floor/iron, /area/science/mixing) "vTj" = ( @@ -60607,15 +60885,14 @@ /turf/open/floor/iron/cafeteria_red, /area/crew_quarters/bar) "vTI" = ( -/obj/machinery/camera/directional/north, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/tile/blue{ + dir = 4 }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white/corner{ dir = 1 }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central) +/area/hallway/secondary/entry) "vUe" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -60649,7 +60926,9 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "vUD" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -60723,19 +61002,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron/dark, /area/security/brig) -"vWR" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ - cycle_id = "atmos_external" - }, -/obj/machinery/door/airlock/external{ - name = "Atmospherics External Airlock"; - req_access_txt = "24" - }, -/turf/open/floor/plating, -/area/engine/atmos) "vXe" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -60890,11 +61156,24 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ +/obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, /turf/open/floor/iron, /area/crew_quarters/fitness) +"way" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ + cycle_id = "atmos_external" + }, +/obj/machinery/door/airlock/external{ + name = "Atmospherics External Airlock"; + req_access_txt = "13" + }, +/turf/open/floor/plating, +/area/maintenance/aft) "waL" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -60964,14 +61243,18 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/line{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, /turf/open/floor/iron/dark, /area/hallway/secondary/command) "wck" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -61532,7 +61815,9 @@ /obj/structure/cable/yellow{ icon_state = "0-8" }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/chair, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat_interior) @@ -61625,6 +61910,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, /turf/open/floor/iron, /area/crew_quarters/dorms) "wph" = ( @@ -61667,7 +61955,9 @@ /turf/open/floor/wood, /area/lawoffice) "wqD" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -61729,9 +62019,6 @@ /turf/open/floor/plating, /area/maintenance/port) "wrE" = ( -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/tile/green/anticorner/contrasted{ dir = 4 }, @@ -61767,7 +62054,6 @@ "wti" = ( /obj/effect/turf_decal/stripes/line, /obj/item/kirbyplants/random, -/obj/machinery/camera/autoname/directional/south, /turf/open/floor/iron, /area/hallway/secondary/entry) "wts" = ( @@ -61908,6 +62194,12 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"wvP" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/turf/open/floor/plating, +/area/maintenance/port) "wvY" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 4 @@ -61979,7 +62271,9 @@ /turf/open/floor/prison, /area/security/prison) "wzg" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -62980,9 +63274,10 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "wXL" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable/yellow{ + icon_state = "0-8" }, /turf/open/floor/iron, /area/crew_quarters/dorms) @@ -63334,7 +63629,9 @@ /turf/open/floor/iron/dark, /area/bridge) "xfL" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -63478,7 +63775,9 @@ /obj/effect/turf_decal/tile/red{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -63517,12 +63816,6 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/grass, /area/hallway/secondary/command) -"xkV" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/closed/wall, -/area/maintenance/starboard/aft) "xli" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -63660,7 +63953,9 @@ /obj/structure/disposalpipe/trunk{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -63780,9 +64075,6 @@ /obj/effect/turf_decal/stripes/red/line{ dir = 4 }, -/obj/machinery/camera/directional/north{ - network = list("ss13","rd") - }, /turf/open/floor/iron, /area/science/explab) "xpk" = ( @@ -64148,6 +64440,13 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"xxx" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/aft) "xxy" = ( /obj/structure/rack, /obj/machinery/status_display/evac{ @@ -64166,7 +64465,9 @@ /turf/open/floor/iron/dark, /area/ai_monitored/storage/eva) "xxL" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -64358,7 +64659,9 @@ pixel_x = 24; req_one_access_txt = "72" }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -64863,7 +65166,9 @@ /turf/open/floor/iron/white, /area/science/explab) "xOk" = ( -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /turf/open/floor/circuit, /area/ai_monitored/turret_protected/aisat/hallway) @@ -65051,7 +65356,9 @@ pixel_y = 3 }, /obj/item/stock_parts/scanning_module, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -65177,7 +65484,9 @@ pixel_x = 3; pixel_y = -3 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -65329,9 +65638,6 @@ /turf/open/floor/iron/freezer, /area/security/prison) "xWg" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, /obj/machinery/light{ dir = 8 }, @@ -65341,6 +65647,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/structure/disposaloutlet, +/obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/white, /area/medical/virology) "xWV" = ( @@ -65371,7 +65682,7 @@ "xXh" = ( /obj/structure/lattice, /obj/machinery/camera/autoname/directional/west{ - network = list("ss13", "minisat") + network = list("ss13","minisat") }, /turf/open/space, /area/space/nearstation) @@ -77866,7 +78177,7 @@ aaa asE aPt jdt -aRY +mUT arB arB arB @@ -77874,7 +78185,7 @@ tAH rQX rQX arB -awZ +vTI tlO azB rQX @@ -85573,7 +85884,7 @@ aBR aBR aLJ aLE -aOl +ubL aPA aQW aQW @@ -86085,7 +86396,7 @@ aBa aBa aaf aKt -rRQ +aLN bDe aOl aPF @@ -87897,10 +88208,10 @@ cCF elS fkv prx -aSg -aPz +wvP +iVk bdW -aSg +kzn aZE bgz biT @@ -88153,9 +88464,9 @@ aWB cCj aSg aYf -dZN -dfx -rPX +faE +aSg +aPz pVb bgB bhX @@ -90470,7 +90781,7 @@ gMk gMk bbV qnI -qnI +rRQ qnI efv qnI @@ -90984,7 +91295,7 @@ nbZ nbZ sEj aYl -nJp +aYl aYl aYl sEj @@ -91983,9 +92294,9 @@ kOu mpK jTP ajo -aqR -aqR -gfW +rPX +mkJ +beF ayE aaa aaa @@ -95407,7 +95718,7 @@ cfz cgR ccw mhm -xxT +cLh cqi cMD cAP @@ -96863,10 +97174,10 @@ qSy arf twX rWw -wXL -wXL +rOm +rOm nuF -wXL +rOm qkk nuF fhu @@ -97376,7 +97687,7 @@ ixa jaD hDg jMo -vGi +wXL oax kcC vGi @@ -98171,7 +98482,7 @@ dgB aaa aaa dgB -vTI +cAx sAB urY aZV @@ -99200,7 +99511,7 @@ aRt aJq aJq aJq -aJq +nJp aJq qVS aJq @@ -99421,7 +99732,7 @@ anF dwH ahn eMP -riU +gQG ahn anF anF @@ -99678,7 +99989,7 @@ anF anF eTS anF -riU +gQG xEr anF anF @@ -99935,7 +100246,7 @@ anF anF ahn vUB -riU +gQG ahn anF anF @@ -100449,8 +100760,8 @@ gXs gXs ahn gEO -riU -anF +gtR +tiP anF jdh fBN @@ -100707,7 +101018,7 @@ aaa ahn tkF riU -anF +vvL anF ahn ahJ @@ -100783,7 +101094,7 @@ bSM bTV bUT fUA -bWU +fYS sYl bYT bZK @@ -101011,7 +101322,7 @@ aNl blh ueA blh -thV +blh oiT blh blh @@ -101051,7 +101362,7 @@ fEJ xHM bLK bLK -cZd +gqr bLK aaf qPz @@ -101307,9 +101618,9 @@ hAw nRF hId hId -dwY -dBW -dwY +fya +uKA +fya hId tdZ aoV @@ -101564,10 +101875,10 @@ bQA bPj bLK aaf -bLK -vWR -bLK -bLK +oSu +way +oSu +oSu wPJ aaf aaf @@ -101821,10 +102132,10 @@ ccC cdD bLK aaf -bLK -aFt -qNf -bMQ +oSu +iui +ctl +bPn wPJ aaa gXs @@ -102078,10 +102389,10 @@ ccB cbH bLK aaf -pJZ -usy -llQ -pJZ +haj +fvo +clI +haj ixA aoV aaf @@ -102335,10 +102646,10 @@ ccD cbH bLK gXs -bMQ -qNf -oAh -bLK +bPn +ctl +sdl +oSu ixA aoV aaf @@ -102592,10 +102903,10 @@ bLK bLK bLK gXs -bLK -bLK -tbv -bLK +oSu +oSu +hSt +oSu lTm cnb cnb @@ -102794,7 +103105,7 @@ kYi ixC aOO kAz -lFf +fRF wRy fRF fRF @@ -102850,9 +103161,9 @@ fgG fgG cnb cnb -lUF -pmV -lUF +vnq +xxx +vnq hid aaf cfj @@ -103622,8 +103933,8 @@ bNd bNd bNd bNd -kOf -bAw +eKr +jlW dvS cfj rAw @@ -106193,7 +106504,7 @@ nZo ouW dPe bNd -mHc +cOe cOe ahO iBQ @@ -112341,7 +112652,7 @@ bBD tRP bBD bBD -ubL +vZt bBD bBD xiZ @@ -112611,7 +112922,7 @@ xLe tIE fQv tIA -sei +goV sei sei hNK @@ -114411,7 +114722,7 @@ kdn sei hNK cNW -xkV +cNW cNW cNW cNW @@ -115898,7 +116209,7 @@ aaa aaa aaf aNa -jsS +aOd aPq aPq ffm diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index 5438d4cc34303..c5a3ea36ef506 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -1932,8 +1932,6 @@ "anB" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/structure/cable/yellow, -/obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/white, /area/science/misc_lab/range) "anD" = ( @@ -26344,7 +26342,7 @@ icon_state = "4-8" }, /turf/open/floor/iron, -/area/hallway/primary/aft) +/area/maintenance/aft) "dbu" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, @@ -28282,9 +28280,6 @@ /area/science/misc_lab/range) "drC" = ( /obj/effect/turf_decal/delivery, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /turf/open/floor/iron/white, /area/science/misc_lab/range) "drP" = ( @@ -29063,9 +29058,8 @@ /turf/closed/wall, /area/crew_quarters/heads/hor) "dxX" = ( -/obj/structure/cable/white, /obj/structure/cable/yellow{ - icon_state = "1-4" + icon_state = "0-4" }, /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -32005,7 +31999,7 @@ dir = 1 }, /turf/open/floor/plating, -/area/maintenance/department/medical/morgue) +/area/maintenance/aft) "dTY" = ( /obj/structure/sign/warning/nosmoking, /turf/closed/wall, @@ -33506,7 +33500,7 @@ }, /obj/machinery/door/airlock/research/glass{ name = "Shuttle dock"; - req_one_access = "47" + req_one_access_txt = "47" }, /turf/open/floor/iron, /area/science/shuttledock) @@ -38547,7 +38541,7 @@ req_access_txt = "5" }, /turf/open/floor/iron/white, -/area/medical/surgery) +/area/maintenance/starboard/aft) "fOK" = ( /obj/machinery/door/airlock/public/glass{ name = "Holodeck Access" @@ -47575,10 +47569,6 @@ /obj/structure/cable/yellow{ icon_state = "2-4" }, -/obj/machinery/door/airlock/command{ - name = "Research Director's Quarters"; - req_access_txt = "30" - }, /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47964,7 +47954,7 @@ name = "isolation shutters" }, /turf/open/floor/iron, -/area/medical/virology) +/area/maintenance/aft) "iXX" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -52854,6 +52844,10 @@ /turf/open/floor/iron, /area/quartermaster/office) "kFK" = ( +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /turf/open/floor/iron/white, /area/science/misc_lab/range) "kFO" = ( @@ -72913,13 +72907,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/machinery/door/airlock/research/glass{ - name = "Research Testing Range"; - req_one_access = "47" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/door/airlock/research{ + req_one_access_txt = "47"; + name = "Research Testing Range" + }, /turf/open/floor/iron, /area/science/misc_lab/range) "rqS" = ( @@ -76375,15 +76369,15 @@ /turf/open/floor/iron, /area/hallway/primary/starboard) "syU" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/white, /area/science/misc_lab/range) "syZ" = ( @@ -81188,7 +81182,7 @@ name = "isolation shutters" }, /turf/open/floor/iron, -/area/medical/surgery) +/area/maintenance/starboard/aft) "uit" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -81833,15 +81827,6 @@ }, /turf/open/floor/iron, /area/hallway/primary/central) -"utb" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 8 - }, -/turf/open/floor/iron/smooth, -/area/tcommsat/server) "utc" = ( /obj/item/beacon, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -133211,7 +133196,7 @@ bUI bXa cSI cSI -utb +mUm ceA vCq dzh diff --git a/_maps/map_files/EchoStation/EchoStation.dmm b/_maps/map_files/EchoStation/EchoStation.dmm index c39a1ef28cded..bcbb03c320ea0 100644 --- a/_maps/map_files/EchoStation/EchoStation.dmm +++ b/_maps/map_files/EchoStation/EchoStation.dmm @@ -7,18 +7,6 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/machinery/computer/crew{ req_one_access = list(5,4) }, @@ -32,23 +20,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/engine/engineering) -"aby" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 4; - name = "Mix to Turbine" +"aaX" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 }, -/obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "abC" = ( /obj/item/assembly/igniter{ pixel_x = 6; @@ -104,6 +86,12 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/ai_upload) +"abN" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "abU" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -136,6 +124,16 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible, /turf/open/floor/iron/tech, /area/science/mixing) +"add" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "ade" = ( /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) @@ -155,6 +153,18 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"adk" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "adG" = ( /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt/planetary, @@ -194,11 +204,28 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"aeP" = ( +/obj/docking_port/stationary{ + dwidth = 12; + height = 69; + id = "whiteship_home"; + name = "Auxiliary Dock"; + width = 25 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface/grass) +"aeQ" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 9 + }, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/engine/supermatter) "aeV" = ( /obj/structure/railing/corner{ dir = 1 }, -/obj/effect/turf_decal/siding/dark{ +/obj/effect/turf_decal/siding/dark/corner{ dir = 8 }, /turf/open/floor/iron/dark/side{ @@ -251,26 +278,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"agi" = ( -/obj/structure/closet/secure_closet/hop, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/modular_computer/tablet/pda, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 1; - pixel_y = 23 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "agI" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 1 @@ -355,14 +362,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"aip" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "ais" = ( /obj/structure/sink{ dir = 1; @@ -416,34 +415,6 @@ }, /turf/open/floor/iron, /area/bridge) -"aje" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"aji" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "ajy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -468,6 +439,28 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"ajX" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Mix to Turbine" + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 4; + name = "Mix to SM"; + piping_layer = 1 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "ajZ" = ( /obj/machinery/ai_slipper{ uses = 10 @@ -742,18 +735,6 @@ }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"aof" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - initialize_directions = 1 - }, -/obj/effect/turf_decal/bot, -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = -30 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "aog" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 1; @@ -859,10 +840,28 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) +"aoI" = ( +/obj/structure/closet/firecloset/full, +/obj/effect/turf_decal/tile/red{ + alpha = 180; + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "aoM" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/security/brig) +"aoV" = ( +/obj/effect/turf_decal/box/white, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "aoY" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -886,9 +885,7 @@ pixel_x = 4; pixel_y = 27 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/white, /area/medical/apothecary) "apn" = ( @@ -926,18 +923,17 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"apI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron, +/area/maintenance/department/science/central) "apP" = ( /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"apX" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction, -/turf/open/floor/plating, -/area/science/server) -"apY" = ( -/obj/machinery/space_heater, -/turf/open/floor/iron/tech, -/area/engine/engineering) "aqa" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, @@ -1057,13 +1053,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"asd" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 4 - }, -/obj/machinery/computer/security, -/turf/open/floor/iron, -/area/bridge) "asf" = ( /obj/machinery/door/airlock/highsecurity{ id_tag = "Emergancycap"; @@ -1173,6 +1162,18 @@ }, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"auy" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "auE" = ( /turf/closed/wall/r_wall, /area/science/robotics) @@ -1222,6 +1223,14 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"avB" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "avD" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating/airless, @@ -1300,6 +1309,27 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/science/central) +"axk" = ( +/obj/structure/closet/crate/science, +/obj/item/circuitboard/computer/shuttle/exploration_shuttle, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/circuitboard/machine/shuttle/heater, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) +"axr" = ( +/obj/structure/window/reinforced{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/grid/steel, +/area/bridge) "axA" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -1324,6 +1354,13 @@ /area/science/robotics) "axZ" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "aya" = ( @@ -1343,22 +1380,6 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) -"ayh" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "HOS"; - sortType = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "ayl" = ( /obj/structure/chair{ dir = 8 @@ -1374,10 +1395,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"ayq" = ( -/obj/effect/landmark/xeno_spawn, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "ayz" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -1403,18 +1420,6 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) "azd" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/effect/turf_decal/tile/blue{ dir = 4 }, @@ -1432,35 +1437,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/science/lab) -"azo" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) -"azy" = ( -/obj/structure/table/optable{ - pixel_y = 7 - }, -/obj/item/surgical_drapes{ - pixel_y = 4 - }, -/obj/machinery/light, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/item/clothing/gloves/color/latex{ - pixel_x = -1; - pixel_y = -1 - }, -/turf/open/floor/iron, -/area/medical/surgery) "azA" = ( /obj/effect/turf_decal/bot, /obj/item/pushbroom, @@ -1477,21 +1453,24 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"azB" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 1 +"azL" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" +/obj/structure/disposalpipe/segment{ + dir = 4 }, -/turf/open/floor/iron/tech, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/dark, /area/engine/engineering) "azS" = ( /obj/item/radio/intercom{ @@ -1504,6 +1483,17 @@ }, /turf/open/floor/wood, /area/hallway/secondary/service) +"aAe" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "aAh" = ( /obj/effect/turf_decal/bot, /obj/structure/extinguisher_cabinet{ @@ -1512,21 +1502,21 @@ /obj/machinery/atmospherics/components/unary/thermomachine/freezer/on, /turf/open/floor/iron/dark, /area/science/server) -"aAq" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/light/floor, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 4 +"aAj" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 +/obj/item/clothing/glasses/meson/engine, +/obj/item/stack/sheet/mineral/copper{ + amount = 5; + pixel_x = -7; + pixel_y = 3 }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/obj/item/storage/belt/utility/full/engi, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "aAy" = ( /obj/structure/railing/corner{ dir = 1 @@ -1554,31 +1544,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"aAY" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/atmos/glass{ - req_access_txt = "11" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "aBu" = ( /obj/structure/table/reinforced, /obj/machinery/reagentgrinder{ @@ -1667,15 +1632,6 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) -"aCC" = ( -/obj/structure/window/reinforced/spawner/north, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "aCN" = ( /obj/effect/turf_decal/trimline/white/line, /obj/effect/turf_decal/stripes/line{ @@ -1721,6 +1677,47 @@ "aEi" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/ai) +"aEx" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) +"aEB" = ( +/obj/structure/railing/corner, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/door/airlock/atmos/glass{ + req_access_txt = "11" + }, +/obj/machinery/door/firedoor, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "aEG" = ( /obj/structure/railing{ dir = 1 @@ -1755,27 +1752,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/science/xenobiology) -"aFL" = ( -/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ - alpha = 180; - color = "#DE3A3A" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron, -/area/security/brig) "aFM" = ( /obj/machinery/teleport/station, /obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, @@ -1901,13 +1877,6 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"aID" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "aIF" = ( /obj/machinery/light{ dir = 4 @@ -1927,10 +1896,6 @@ }, /turf/open/floor/iron, /area/bridge) -"aIJ" = ( -/obj/effect/decal/cleanable/dirt/dust, -/turf/closed/wall, -/area/maintenance/department/chapel) "aIR" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -2044,13 +2009,25 @@ /area/science/mixing/chamber) "aJD" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/iron, /area/maintenance/department/cargo) +"aJI" = ( +/obj/effect/turf_decal/siding/dark, +/obj/structure/railing, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "aJO" = ( /obj/item/radio/intercom{ pixel_x = -1; @@ -2157,20 +2134,48 @@ /obj/machinery/door/poddoor/incinerator_toxmix, /turf/open/floor/engine/vacuum, /area/science/mixing/chamber) +"aLo" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/light, +/obj/structure/sign/warning/pods{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "aLz" = ( /obj/machinery/door/poddoor/incinerator_atmos_aux, /obj/structure/lattice/catwalk/over, /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, /area/maintenance/disposal/incinerator) -"aLS" = ( -/obj/structure/railing/corner{ +"aLD" = ( +/obj/structure/railing{ dir = 1 }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/turf/open/floor/glass/reinforced/plasma, +/area/maintenance/department/security/brig) +"aLI" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/suit_storage_unit/cmo, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) +"aLU" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "aMt" = ( /obj/machinery/vending/custom{ pixel_y = -1 @@ -2231,6 +2236,12 @@ dir = 4 }, /area/crew_quarters/cafeteria) +"aOt" = ( +/obj/effect/turf_decal/evac, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "aOw" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/railing/corner, @@ -2246,13 +2257,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"aOy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/power/port_gen/pacman, -/turf/open/floor/iron/dark, -/area/engine/engineering) "aOF" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -2280,14 +2284,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"aOO" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/manifold/general/hidden{ - dir = 4 - }, -/obj/machinery/rnd/server, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "aOT" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -2315,17 +2311,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) -"aPh" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoshutter"; - name = "CMO Office Shutters" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) "aPk" = ( /obj/machinery/door/airlock/command{ name = "Research Director's Office"; @@ -2419,6 +2404,18 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) +"aQF" = ( +/obj/structure/railing/corner, +/obj/effect/turf_decal/siding/dark/corner, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "aQK" = ( /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark/side{ @@ -2540,11 +2537,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"aRV" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/pipe/simple/general/hidden, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "aRY" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/machinery/light/small{ @@ -2629,6 +2621,14 @@ /obj/machinery/computer/crew, /turf/open/floor/iron, /area/bridge) +"aTm" = ( +/obj/structure/railing{ + dir = 8; + layer = 4 + }, +/obj/structure/reagent_dispensers/watertank, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "aTx" = ( /obj/machinery/atmospherics/pipe/simple/general/visible, /turf/closed/wall/r_wall, @@ -2650,21 +2650,6 @@ /obj/effect/landmark/start/security_officer, /turf/open/floor/iron/dark, /area/security/brig) -"aUc" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "aUf" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2725,6 +2710,26 @@ /obj/structure/barricade/wooden, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"aVl" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "aVs" = ( /obj/machinery/status_display/ai{ pixel_x = 32 @@ -2752,22 +2757,15 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) -"aVM" = ( -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ - dir = 4 - }, -/obj/structure/table/reinforced, -/obj/item/paper_bin{ - pixel_x = -5; - pixel_y = 5 - }, -/obj/item/book/manual/wiki/security_space_law{ - pixel_x = 7; - pixel_y = 6 +"aVH" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, +/obj/item/plant_analyzer{ + pixel_x = 2; + pixel_y = -8 }, -/obj/machinery/digital_clock/directional/north, /turf/open/floor/iron, -/area/security/brig) +/area/maintenance/department/medical/morgue) "aVS" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/firecloset/full, @@ -2799,24 +2797,6 @@ }, /turf/open/floor/iron/white, /area/science/lab) -"aWp" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "aWy" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -2935,6 +2915,9 @@ /obj/item/kirbyplants/random, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) +"aZV" = ( +/turf/closed/wall/r_wall/rust, +/area/quartermaster/storage) "baa" = ( /turf/closed/wall/r_wall, /area/medical/morgue) @@ -3044,14 +3027,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron, /area/engine/atmos) -"bdG" = ( -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "bdN" = ( /obj/structure/disposalpipe/segment{ dir = 1 @@ -3067,22 +3042,6 @@ /obj/structure/sign/departments/custodian, /turf/closed/wall, /area/crew_quarters/cafeteria) -"bev" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "bfz" = ( /obj/structure/spider/stickyweb, /turf/open/floor/plating/asteroid/planetary, @@ -3134,6 +3093,14 @@ }, /turf/open/floor/iron, /area/bridge) +"bgo" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/space_heater, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/dark, +/area/engine/engineering) "bgs" = ( /turf/open/floor/plating/beach/coastline_b{ dir = 10 @@ -3201,6 +3168,21 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"bic" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "bip" = ( /obj/structure/railing{ dir = 4 @@ -3244,6 +3226,38 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"bjB" = ( +/obj/item/wallframe/extinguisher_cabinet{ + pixel_x = 31; + pixel_y = 1 + }, +/obj/structure/closet/toolcloset, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/glass/fifty, +/obj/item/stack/sheet/wood/fifty, +/obj/item/stack/sheet/wood/fifty, +/obj/item/stack/rods/fifty, +/obj/item/bluespace_capsule, +/obj/item/wrench{ + pixel_x = -4; + pixel_y = 5 + }, +/turf/open/floor/plating, +/area/vacant_room/office) +"bjJ" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "bkn" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/southleft{ @@ -3303,6 +3317,20 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"bkP" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "bkW" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -3321,9 +3349,29 @@ /obj/item/storage/box/bodybags, /turf/open/floor/iron/dark, /area/medical/morgue) +"blt" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "blO" = ( /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"bmi" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "bmC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -3356,6 +3404,13 @@ /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall/r_wall, /area/bridge/meeting_room) +"bnO" = ( +/obj/item/seeds/flower/poppy, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "bnW" = ( /obj/structure/table/reinforced, /obj/item/storage/box/flashbangs{ @@ -3415,6 +3470,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron/white/side{ dir = 1 }, @@ -3446,12 +3504,6 @@ /obj/item/pool/pool_noodle, /turf/open/floor/iron/white, /area/crew_quarters/fitness/recreation) -"boV" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 8 - }, -/turf/open/floor/plating, -/area/space/nearstation) "bpn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -3474,6 +3526,19 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"bpp" = ( +/obj/structure/fence, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"bpL" = ( +/obj/effect/turf_decal/trimline/dark_blue/filled/line{ + dir = 4 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/photocopier, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "bpM" = ( /obj/structure/sink/kitchen{ pixel_y = 28 @@ -3555,15 +3620,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat_interior) -"bqy" = ( -/obj/item/kirbyplants/random, -/obj/structure/extinguisher_cabinet{ - pixel_x = 32 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "bra" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -3616,28 +3672,17 @@ /obj/structure/railing, /turf/open/openspace, /area/maintenance/department/crew_quarters/bar) -"bsL" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/window/reinforced, -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","security") - }, -/obj/structure/table, -/turf/open/floor/iron, -/area/security/brig) "btw" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/engine) -"btC" = ( -/obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 +"bty" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/frame/computer{ + anchored = 1 }, -/turf/open/floor/iron/white, -/area/medical/surgery) +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "btG" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -3822,12 +3867,6 @@ /obj/structure/railing/corner, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"bxR" = ( -/obj/structure/flora/ausbushes/lavendergrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) "bxZ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/space_heater, @@ -3836,7 +3875,9 @@ "byk" = ( /obj/structure/closet/secure_closet/lethalshots, /obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; color = "#DE3A3A" @@ -3872,7 +3913,9 @@ /area/medical/medbay/central) "byu" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -3924,24 +3967,14 @@ name = "mainframe floor" }, /area/tcommsat/server) -"bzU" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 1 +"bzO" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12"; + security_level = 6 }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/turf/open/floor/plating, +/area/maintenance/department/security/brig) "bAa" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -3960,7 +3993,9 @@ c_tag = "Corporate Meeting Room"; dir = 5 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ icon_state = "1-4" @@ -3971,17 +4006,6 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) -"bAp" = ( -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "bAw" = ( /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface/sand) @@ -4009,23 +4033,6 @@ /obj/structure/flora/rock, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"bCq" = ( -/obj/machinery/door/window/brigdoor/southright{ - dir = 4; - name = "Command Chair"; - req_access_txt = "19" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "bCu" = ( /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, @@ -4049,13 +4056,6 @@ }, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"bDC" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "bDD" = ( /turf/closed/wall, /area/hydroponics) @@ -4093,18 +4093,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) -"bEe" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/microwave{ - pixel_x = -2; - pixel_y = 5 - }, -/turf/open/floor/prison/dark, -/area/security/prison) "bEg" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -4116,17 +4104,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/science/robotics) -"bEo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/numbers/two_nine, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) "bEu" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -4146,24 +4123,29 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"bFF" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/trinary/filter/flipped/critical{ - dir = 1 - }, +"bEQ" = ( /obj/effect/turf_decal/bot, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/airalarm/directional/north, +/turf/open/floor/iron/freezer, +/area/crew_quarters/kitchen/coldroom) "bFY" = ( /obj/machinery/atmospherics/miner/station/n2o, /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/engine/n2o, /area/engine/atmos) +"bGc" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/bridge) "bGl" = ( /obj/machinery/power/compressor{ comp_id = "incineratorturbineLeft"; @@ -4196,70 +4178,22 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"bGW" = ( -/obj/structure/table, -/obj/item/stack/rods/fifty, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 5; - pixel_y = 4 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 4; - pixel_y = -1 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = 1; - pixel_y = 1 +"bGP" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -5; - pixel_y = 1 - }, -/obj/item/stack/sheet/glass/fifty{ - pixel_x = -2; - pixel_y = -1 - }, -/obj/item/stack/sheet/plasteel{ - amount = 10; - pixel_x = -2; - pixel_y = 2 - }, -/obj/item/stack/sheet/rglass{ - amount = 30; - pixel_x = 2; - pixel_y = -2 +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "0-2" }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "bHi" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/railing/corner, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"bHy" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/newscaster{ - pixel_y = -30 - }, -/obj/effect/turf_decal/bot{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/light, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "bHH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -4308,7 +4242,9 @@ /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) "bIO" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -4339,6 +4275,14 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"bJS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/rnd/production/circuit_imprinter, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "bKc" = ( /obj/machinery/air_sensor/atmos/nitrogen_tank, /obj/machinery/atmospherics/pipe/manifold/yellow/hidden/layer2{ @@ -4519,6 +4463,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron, /area/security/brig) "bNd" = ( @@ -4593,6 +4540,35 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/quartermaster/qm) +"bPr" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/fence/door{ + req_one_access_txt = "32" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) +"bPL" = ( +/obj/structure/table, +/obj/item/book/manual/wiki/sopengineering, +/obj/item/clothing/glasses/meson{ + pixel_y = 1 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "bQr" = ( /obj/structure/table/reinforced, /obj/structure/desk_bell{ @@ -4618,12 +4594,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"bRj" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "bRk" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -4638,6 +4608,18 @@ }, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) +"bRn" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "bSm" = ( /obj/item/radio/intercom{ broadcasting = 1; @@ -4684,7 +4666,9 @@ /area/maintenance/department/crew_quarters/bar) "bSX" = ( /obj/machinery/computer/prisoner/management, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -4738,6 +4722,22 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"bUC" = ( +/obj/structure/window/plasma/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/structure/extinguisher_cabinet{ + pixel_y = 32 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "bUT" = ( /obj/structure/sign/directions/supply{ dir = 8; @@ -4754,21 +4754,28 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/bridge) -"bVi" = ( +"bVo" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180; - dir = 1 + icon_state = "4-8" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 + dir = 4 }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "bVS" = ( /obj/effect/turf_decal/siding/wood{ dir = 5 @@ -4819,6 +4826,14 @@ /obj/effect/spawner/room/tenxfive, /turf/open/floor/plating, /area/maintenance/department/eva) +"bYf" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "bYh" = ( /obj/effect/turf_decal/tile/dark_blue{ alpha = 180 @@ -4863,6 +4878,21 @@ }, /turf/open/floor/plating, /area/hydroponics) +"bYp" = ( +/obj/structure/closet/l3closet/virology, +/obj/effect/turf_decal/bot, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/item/storage/box/beakers{ + pixel_x = 4; + pixel_y = 14 + }, +/obj/item/storage/bag/bio, +/obj/item/slime_scanner, +/obj/item/storage/box/syringes, +/turf/open/floor/iron/grid/steel, +/area/science/xenobiology) "bZe" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -4948,6 +4978,12 @@ name = "mainframe floor" }, /area/tcommsat/server) +"caT" = ( +/obj/structure/filingcabinet/chestdrawer, +/obj/effect/turf_decal/bot, +/obj/machinery/digital_clock/directional/south, +/turf/open/floor/wood, +/area/crew_quarters/heads/hop) "cbd" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5020,6 +5056,24 @@ }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"cdn" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "cdq" = ( /obj/structure/window/plasma/reinforced{ dir = 4 @@ -5033,12 +5087,6 @@ /obj/machinery/power/rad_collector/anchored, /turf/open/floor/plating, /area/engine/supermatter) -"cdB" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 9 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "cea" = ( /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall, @@ -5152,6 +5200,16 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"cfJ" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/obj/effect/landmark/start/chief_medical_officer, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "cgb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -5166,6 +5224,25 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"cgI" = ( +/obj/effect/landmark/start/assistant, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) +"cgQ" = ( +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/structure/railing, +/obj/effect/turf_decal/siding/white, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/lab) "chG" = ( /turf/open/floor/plating/beach/coastline_b{ dir = 8 @@ -5213,17 +5290,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"cjo" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/medical/medbay/central) "cjG" = ( /obj/structure/chair/fancy/sofa/old/right{ dir = 4 @@ -5272,6 +5338,21 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"cle" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/spawner/structure/window, +/obj/structure/curtain/directional{ + color = "#ACD1E9"; + icon_state = "bathroom-open"; + icon_type = "bathroom" + }, +/turf/open/floor/plating, +/area/medical/surgery) "clO" = ( /obj/machinery/vending/boozeomat, /turf/closed/wall, @@ -5313,8 +5394,27 @@ dir = 5 }, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"cmT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "cmX" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted, /obj/machinery/photocopier, @@ -5444,6 +5544,10 @@ }, /turf/open/floor/iron/dark, /area/teleporter) +"coy" = ( +/obj/effect/spawner/structure/window/shuttle, +/turf/open/floor/plating, +/area/asteroid/paradise/surface) "coF" = ( /obj/structure/closet/crate/hydroponics{ req_access_txt = "35;28" @@ -5499,7 +5603,9 @@ }, /obj/machinery/photocopier, /obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -5518,7 +5624,9 @@ icon_state = "2-8" }, /obj/effect/spawner/lootdrop/aimodule_harmless, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable{ icon_state = "0-2" }, @@ -5561,6 +5669,10 @@ }, /turf/open/floor/iron/dark, /area/security/detectives_office) +"crm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/asteroid/paradise/surface) "cry" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -5661,6 +5773,12 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"ctk" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/engine, +/area/engine/supermatter) "cto" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -5681,27 +5799,6 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/medical/medbay/central) -"cuW" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"cvt" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "cvu" = ( /obj/machinery/power/terminal{ dir = 8 @@ -5725,29 +5822,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/crew_quarters/heads/chief) -"cvP" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"cwk" = ( -/obj/effect/turf_decal/siding/dark/corner, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 +"cwc" = ( +/obj/machinery/shuttle/engine/plasma{ + dir = 1 }, -/obj/effect/turf_decal/trimline/yellow/corner, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "cwz" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5769,9 +5849,6 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/sink{ dir = 4; pixel_x = 12; @@ -5863,12 +5940,9 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/crew_quarters/dorms) -"czn" = ( -/obj/machinery/door/firedoor, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, +"cyT" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron/dark, /area/maintenance/department/medical/central) "czv" = ( /obj/effect/turf_decal/stripes/line, @@ -5933,6 +6007,47 @@ /obj/item/paicard, /turf/open/floor/plating, /area/hallway/secondary/service) +"cAK" = ( +/obj/machinery/airalarm/all_access{ + dir = 4; + pixel_x = 24 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 7 + }, +/obj/item/pen{ + pixel_x = 5; + pixel_y = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/camera/autoname/directional/east{ + network = list("ss13","engine") + }, +/obj/item/storage/toolbox/emergency{ + pixel_x = 3; + pixel_y = -1 + }, +/obj/item/extinguisher/advanced{ + pixel_x = -8; + pixel_y = 2 + }, +/obj/effect/loot_jobscale/medical/burn_kit, +/turf/open/floor/iron, +/area/maintenance/disposal/incinerator) "cBs" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line, @@ -5951,12 +6066,6 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/eva) -"cBO" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/plating, -/area/maintenance/department/science/central) "cCz" = ( /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, @@ -6020,7 +6129,9 @@ /area/ai_monitored/turret_protected/aisat/maint) "cDT" = ( /obj/machinery/airalarm/directional/east, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/bookcase/manuals/medical, /obj/structure/cable/yellow{ icon_state = "0-8" @@ -6159,12 +6270,11 @@ /turf/open/floor/iron/sepia, /area/quartermaster/storage) "cHd" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/dark{ +/obj/effect/turf_decal/siding/dark/corner{ dir = 4 }, -/turf/open/floor/iron/dark/side{ - dir = 6 +/turf/open/floor/iron/dark/corner{ + dir = 4 }, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -6224,6 +6334,20 @@ /mob/living/simple_animal/bot/cleanbot/medbay, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) +"cJd" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + alpha = 180; + dir = 4 + }, +/obj/machinery/newscaster{ + pixel_y = 33 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/rnd/production/techfab/department/security, +/turf/open/floor/iron/dark, +/area/security/warden) "cJf" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, @@ -6304,12 +6428,6 @@ /obj/machinery/telecomms/processor/preset_two, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) -"cLt" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/turf/open/floor/plating, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "cLw" = ( /obj/structure/toilet{ pixel_x = -1; @@ -6342,18 +6460,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) -"cLP" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "cLW" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/chair/office/light{ @@ -6366,23 +6472,22 @@ /obj/structure/railing, /turf/open/openspace, /area/engine/atmos) -"cMr" = ( -/obj/effect/turf_decal/siding/dark/corner{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/corner, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "cNn" = ( /obj/effect/turf_decal/bot, /obj/structure/reflector/box, /turf/open/floor/iron, /area/engine/engineering) +"cNG" = ( +/obj/effect/turf_decal/box, +/obj/machinery/holopad, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/turf/open/floor/iron, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "cNI" = ( /obj/effect/turf_decal/evac, /turf/open/floor/iron, @@ -6431,16 +6536,14 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron, /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"cPw" = ( -/obj/machinery/firealarm/directional/east, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "cQe" = ( /obj/structure/stairs{ dir = 8 @@ -6523,18 +6626,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/effect/mapping_helpers/airlock/cyclelink_helper_multi{ cycle_id = "medbay" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /obj/machinery/door/airlock/medical/glass{ emergency = 1; id_tag = "MedbayFoyer"; @@ -6543,30 +6637,20 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"cSb" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/button/door{ - desc = "A remote control-switch for secure storage."; - id = "engsm"; - name = "Radiation shutters Toggle"; - pixel_y = 26; - req_access_txt = "11" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Chamber" +"cRE" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 }, -/obj/structure/cable{ - icon_state = "2-8" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/effect/turf_decal/caution{ - dir = 1 +/obj/machinery/ai_slipper{ + uses = 10 }, -/turf/open/floor/plating, -/area/engine/supermatter) +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "cSx" = ( /obj/machinery/atmospherics/components/trinary/filter/atmos/n2{ dir = 8; @@ -6622,19 +6706,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/rust, /area/science/test_area) -"cTC" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/structure/disposalpipe/junction/flip, -/turf/open/floor/iron/dark, -/area/engine/engineering) "cTP" = ( /obj/item/target/alien/anchored, /obj/effect/turf_decal/stripes/line{ @@ -6796,6 +6867,14 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/rust, /area/science/test_area) +"cZG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "cZZ" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -6859,6 +6938,15 @@ }, /turf/open/floor/iron, /area/teleporter) +"dbT" = ( +/obj/machinery/seed_extractor, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "dbV" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, @@ -6985,6 +7073,16 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"dgd" = ( +/obj/effect/turf_decal/box/white, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 5 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "dgf" = ( /obj/structure/closet/secure_closet/genpop{ anchored = 0 @@ -7002,20 +7100,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/central) -"dhi" = ( -/obj/machinery/camera/autoname/directional/west{ - network = list("ss13","medbay") - }, -/obj/machinery/vending/medical, -/obj/structure/cable/yellow{ - icon_state = "0-4" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/status_display/evac{ - pixel_x = -32 - }, -/turf/open/floor/iron, -/area/medical/surgery) "dhL" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -7089,6 +7173,20 @@ /obj/item/paicard, /turf/open/floor/plating, /area/maintenance/department/bridge) +"diV" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/landmark/start/medical_doctor, +/obj/structure/chair/fancy/plastic, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/plating, +/area/medical/surgery) "djm" = ( /turf/open/openspace, /area/crew_quarters/heads/hor) @@ -7108,25 +7206,6 @@ /obj/effect/decal/cleanable/greenglow, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) -"dkl" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "dkt" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -7158,17 +7237,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/science/lab) -"dkP" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/evac, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "dkR" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, /obj/structure/reagent_dispensers/water_cooler, @@ -7184,6 +7252,12 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"dlw" = ( +/obj/machinery/door/airlock/external/glass{ + autoclose = 0.1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "dme" = ( /obj/structure/railing{ dir = 4 @@ -7239,6 +7313,14 @@ /obj/structure/ladder, /turf/open/floor/pod/dark, /area/maintenance/department/bridge) +"dou" = ( +/obj/machinery/light{ + dir = 1 + }, +/obj/effect/turf_decal/delivery, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/engine, +/area/science/explab) "doY" = ( /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; @@ -7298,6 +7380,13 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/medical/apothecary) +"drs" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) "dry" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -7415,22 +7504,6 @@ "dvc" = ( /turf/closed/mineral/random/air, /area/asteroid/paradise/surface) -"dvw" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "dvV" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 8 @@ -7457,6 +7530,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"dwr" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/machinery/vending/coffee, +/obj/effect/turf_decal/bot, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/security/brig) "dxm" = ( /obj/effect/turf_decal/trimline/yellow, /obj/structure/cable/yellow{ @@ -7491,14 +7574,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"dxG" = ( -/obj/effect/landmark/start/medical_doctor, -/obj/structure/chair/fancy/plastic, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/plating, -/area/medical/surgery) "dxH" = ( /obj/structure/chair/fancy/plastic{ dir = 8 @@ -7525,6 +7600,27 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"dyQ" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","security") + }, +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, +/area/maintenance/department/security/brig) +"dzb" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "dzp" = ( /obj/structure/flora/grass/jungle/b, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -7691,6 +7787,17 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) +"dDA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/window/reinforced, +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","security") + }, +/obj/structure/table, +/turf/open/floor/iron, +/area/security/brig) "dDM" = ( /obj/machinery/door/airlock{ id_tag = "Cabin4"; @@ -7813,6 +7920,9 @@ /obj/structure/closet/crate, /turf/open/floor/plating, /area/maintenance/department/chapel) +"dGX" = ( +/turf/open/openspace, +/area/asteroid/paradise/surface) "dHc" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -7936,7 +8046,9 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -7992,6 +8104,24 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"dLq" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/layer_manifold{ + dir = 4 + }, +/turf/open/floor/iron, +/area/engine/engineering) "dLt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/tile/purple{ @@ -8059,15 +8189,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"dNV" = ( -/obj/structure/railing/corner, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "dNX" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/sepia/planetary{ @@ -8189,6 +8310,19 @@ }, /turf/open/floor/plating/beach/water, /area/asteroid/paradise/surface/water) +"dQy" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "dQC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -8221,19 +8355,6 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/bridge) -"dRW" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 1 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "dSa" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8323,24 +8444,6 @@ }, /turf/open/floor/wood, /area/asteroid/paradise/surface) -"dTP" = ( -/obj/structure/closet/l3closet/virology, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/item/storage/box/beakers{ - pixel_x = 5; - pixel_y = 1 - }, -/obj/item/storage/box/beakers{ - pixel_x = 4; - pixel_y = 14 - }, -/obj/item/storage/bag/bio, -/obj/item/slime_scanner, -/turf/open/floor/iron/grid/steel, -/area/science/xenobiology) "dUi" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -8383,7 +8486,9 @@ req_access = null; req_one_access_txt = "28;25;35" }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -8471,21 +8576,30 @@ }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"eam" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/disposalpipe/segment{ - dir = 4 +"dYY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 +/obj/machinery/ai_slipper{ + uses = 10 }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) +"dZF" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "eaA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -8493,6 +8607,18 @@ "ebd" = ( /turf/open/floor/iron, /area/science/misc_lab) +"ebh" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_one_access_txt = "7;29;12" + }, +/turf/open/floor/plating, +/area/maintenance/department/science/central) "ebn" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/fullgrass, @@ -8551,6 +8677,25 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"ecx" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"ecH" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/pod/dark, +/area/crew_quarters/cafeteria) "eec" = ( /obj/structure/railing, /turf/open/openspace, @@ -8597,6 +8742,20 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) +"egg" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/closet/firecloset/full, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) +"egS" = ( +/obj/machinery/biogenerator, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "eha" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/decal/cleanable/dirt/dust, @@ -8618,18 +8777,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/maintenance/department/cargo) -"ehm" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "ehq" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -8679,41 +8826,6 @@ "ehJ" = ( /turf/open/openspace, /area/maintenance/department/chapel) -"ehT" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"eib" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"eid" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "eit" = ( /obj/structure/toilet{ pixel_x = -1; @@ -8732,27 +8844,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"eiN" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "eiO" = ( /obj/machinery/gateway{ dir = 1 @@ -8780,27 +8871,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/carpet/royalblack, /area/vacant_room/office) -"ejo" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "ejD" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/stripes/line{ @@ -8829,17 +8899,21 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"ejS" = ( -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/effect/turf_decal/stripes/line{ - dir = 10 +"ekb" = ( +/obj/item/kirbyplants/random{ + pixel_y = 22 }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +/obj/machinery/power/apc/auto_name/directional/west{ + pixel_x = -24 + }, +/obj/structure/cable/yellow, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/open/floor/iron/dark, -/area/engine/engineering) +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "ekv" = ( /obj/machinery/light, /obj/effect/turf_decal/stripes/line{ @@ -8882,18 +8956,20 @@ /area/science/research) "elK" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"elM" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "emp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -8942,6 +9018,20 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"eoh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/evac{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "eop" = ( /obj/effect/turf_decal/bot, /obj/structure/closet/secure_closet/freezer/kitchen{ @@ -8987,6 +9077,12 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"epb" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/closed/mineral/random/air, +/area/engine/atmos) "epj" = ( /obj/machinery/stasis{ dir = 8 @@ -9001,19 +9097,23 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat/foyer) -"ept" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" +"epm" = ( +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/obj/structure/cable{ + icon_state = "1-8" }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "epO" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/machinery/chem_dispenser/drinks, /obj/structure/table, /obj/machinery/light{ @@ -9032,11 +9132,6 @@ /obj/machinery/telecomms/server/presets/security, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) -"epZ" = ( -/obj/structure/filingcabinet/chestdrawer, -/obj/effect/turf_decal/bot, -/turf/open/floor/wood, -/area/crew_quarters/heads/hop) "eqi" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -9141,25 +9236,52 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) -"etN" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/structure/railing/corner, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) "etV" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/nitrogen_input{ piping_layer = 4 }, /turf/open/floor/engine/n2, /area/engine/atmos) +"eur" = ( +/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ + dir = 8; + node1_concentration = 0.21; + node2_concentration = 0.79; + on = 0; + piping_layer = 2 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/obj/structure/window/plasma/reinforced{ + dir = 1 + }, +/turf/open/floor/iron, +/area/engine/atmos) "euN" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/engine) +"evc" = ( +/obj/structure/chair/fancy/plastic, +/obj/item/cigbutt{ + pixel_x = -13; + pixel_y = -9 + }, +/obj/effect/decal/cleanable/ash{ + pixel_x = -18; + pixel_y = -4 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "eve" = ( /obj/machinery/light_switch{ pixel_x = 23; @@ -9208,23 +9330,27 @@ /obj/effect/turf_decal/trimline/yellow, /turf/open/floor/carpet/purple, /area/crew_quarters/heads/hor) -"ewS" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/obj/structure/table/reinforced, -/obj/item/book/manual/wiki/engineering_hacking{ - pixel_x = -3; - pixel_y = 3 - }, -/obj/item/book/manual/wiki/engineering_guide, -/obj/item/book/manual/wiki/engineering_construction{ - pixel_x = 3; - pixel_y = -3 +"ewJ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/button/door{ + id = "commissaryshutters1"; + name = "Commissary Shutters Control #1"; + pixel_x = -32; + pixel_y = -32 }, -/obj/structure/window/reinforced, /turf/open/floor/iron, -/area/engine/engineering) +/area/maintenance/department/chapel) +"exf" = ( +/obj/structure/fence/cut/large, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"exl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) "exo" = ( /obj/structure/table, /obj/effect/turf_decal/tile/yellow/fourcorners/contrasted{ @@ -9280,6 +9406,11 @@ dir = 8 }, /turf/open/floor/iron, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) +"exY" = ( +/turf/open/floor/glass/reinforced, /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) @@ -9346,19 +9477,6 @@ }, /turf/open/floor/plating, /area/bridge/meeting_room) -"ezq" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "ezz" = ( /obj/structure/disposalpipe/segment{ dir = 6 @@ -9394,6 +9512,9 @@ network = list("ss13","rd") }, /obj/machinery/firealarm/directional/south, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) "eAc" = ( @@ -9406,13 +9527,13 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/dark, /area/science/mixing) -"eAr" = ( -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable/yellow{ - icon_state = "0-4" +"eAO" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/evac{ + dir = 1 }, /turf/open/floor/iron, -/area/maintenance/department/medical/central) +/area/maintenance/department/science/central) "eAX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/vending/clothing, @@ -9428,13 +9549,6 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"eBh" = ( -/obj/structure/railing/corner, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/effect/turf_decal/siding/white/corner, -/turf/open/floor/iron/white, -/area/science/lab) "eBA" = ( /obj/machinery/computer/station_alert{ dir = 1 @@ -9469,16 +9583,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"eBQ" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "eBY" = ( /obj/structure/railing, /obj/machinery/camera/autoname/directional/west{ @@ -9546,6 +9650,24 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/crew_quarters/dorms) +"eDl" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/medical/medbay/central) "eDq" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -9614,6 +9736,17 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, /turf/open/floor/iron, /area/security/prison) +"eEl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "External Gas to Loop" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/engine/engineering) "eEo" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -9630,24 +9763,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"eFt" = ( -/obj/structure/fireaxecabinet{ - pixel_y = 31 - }, -/obj/machinery/status_display/evac{ - pixel_x = -33 - }, -/obj/structure/table/wood, -/obj/machinery/recharger{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/storage/fancy/cigarettes/cigars/havana{ - pixel_x = 13; - pixel_y = 9 - }, -/turf/open/floor/wood, -/area/crew_quarters/heads/captain) "eFA" = ( /obj/structure/railing/corner{ dir = 8 @@ -9664,6 +9779,37 @@ "eFS" = ( /turf/open/openspace, /area/science/robotics) +"eFW" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) +"eFY" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "eGc" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -9779,6 +9925,15 @@ }, /turf/open/floor/iron/freezer, /area/crew_quarters/kitchen/coldroom) +"eIb" = ( +/obj/structure/lattice, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "eIc" = ( /turf/closed/wall/r_wall, /area/maintenance/department/engine) @@ -9805,7 +9960,9 @@ alpha = 180 }, /obj/machinery/light, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/item/camera{ pixel_x = 2; @@ -9834,6 +9991,10 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"eKt" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "eKX" = ( /turf/closed/wall, /area/chapel/office) @@ -9931,6 +10092,24 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) +"eNE" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"eNV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/light/small, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "eOa" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 @@ -9982,6 +10161,12 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) +"ePf" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "ePt" = ( /obj/structure/cable{ icon_state = "1-2" @@ -10003,18 +10188,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"ePy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "ePH" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -10029,6 +10202,41 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/chapel/office) +"eQh" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/structure/table/reinforced, +/obj/item/folder/white{ + pixel_x = -5 + }, +/obj/item/holosign_creator/medical{ + pixel_x = -4; + pixel_y = 17 + }, +/obj/item/toy/figure/cmo{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/stamp/cmo{ + pixel_x = -2 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen{ + desc = "Used for monitoring medbay to ensure patient safety."; + dir = 1; + name = "Medbay Monitor"; + network = list("medbay"); + pixel_x = 1; + pixel_y = -32 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "eQo" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/effect/turf_decal/bot, @@ -10059,6 +10267,16 @@ /obj/item/clothing/glasses/hud/security/sunglasses, /turf/open/floor/carpet/red, /area/security/detectives_office) +"eQW" = ( +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/machinery/space_heater, +/turf/open/floor/iron, +/area/maintenance/department/medical/central) "eSh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -10155,6 +10373,21 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"eUG" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/manifold/orange/visible{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "eUY" = ( /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, @@ -10242,20 +10475,29 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"eWv" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-16" +"eWs" = ( +/obj/structure/flora/rock/pile, +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/effect/turf_decal/trimline/yellow, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) +"eWv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, +/obj/structure/ladder, +/turf/open/floor/pod/dark, /area/maintenance/department/chapel) "eWC" = ( /obj/structure/cable/yellow{ @@ -10300,6 +10542,15 @@ "eXB" = ( /turf/closed/wall, /area/maintenance/department/crew_quarters/dorms) +"eXD" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/cable, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "eXG" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -10349,6 +10600,29 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/central) +"eYC" = ( +/obj/machinery/atmospherics/components/binary/pump/layer4{ + dir = 4; + name = "Port to Filter" + }, +/obj/machinery/atmospherics/components/binary/pump/layer2{ + dir = 8; + name = "Air to Ports" + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "eYE" = ( /obj/item/kirbyplants/random, /obj/effect/decal/cleanable/dirt/dust, @@ -10399,6 +10673,12 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/crew_quarters/fitness/recreation) +"eZG" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "eZI" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -10413,6 +10693,10 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) +"eZZ" = ( +/obj/structure/frame/machine, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "fae" = ( /obj/machinery/camera/motion/directional/south{ c_tag = "MiniSat Exterior 1"; @@ -10425,6 +10709,44 @@ /obj/machinery/light, /turf/open/openspace, /area/crew_quarters/heads/hor) +"fap" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/table, +/obj/item/pipe_dispenser{ + pixel_x = 1; + pixel_y = 12 + }, +/obj/item/pipe_dispenser{ + pixel_y = 7 + }, +/obj/item/clothing/gloves/color/black, +/obj/item/clothing/glasses/meson{ + pixel_y = 1 + }, +/obj/item/clothing/glasses/meson{ + pixel_x = 2 + }, +/obj/item/card/id/job/atmospheric_technician{ + access = list(11); + pixel_y = -5 + }, +/obj/item/clothing/glasses/meson/engine{ + pixel_y = -6 + }, +/obj/item/clothing/head/beret/atmos{ + pixel_x = 4; + pixel_y = -2 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "faZ" = ( /turf/closed/wall/r_wall, /area/quartermaster/warehouse) @@ -10500,22 +10822,8 @@ /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) "fcl" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/blue, +/turf/open/floor/glass/reinforced, /area/medical/medbay/central) "fcz" = ( /obj/structure/girder, @@ -10528,17 +10836,6 @@ }, /turf/open/floor/iron/tech, /area/science/mixing/chamber) -"fcL" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/maintenance/department/science/xenobiology) "fdh" = ( /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) @@ -10653,21 +10950,8 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) -"fgO" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "fgP" = ( /turf/closed/wall, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) -"fhb" = ( -/turf/open/floor/iron/dark/side{ - dir = 10 - }, /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) @@ -10675,30 +10959,6 @@ /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall/rust, /area/maintenance/disposal/incinerator) -"fhP" = ( -/obj/structure/safe, -/obj/item/folder/documents, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c1000, -/obj/item/stack/spacecash/c500, -/obj/item/stack/spacecash/c500, -/obj/item/ammo_box/a357, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/extinguisher_cabinet{ - pixel_x = -28 - }, -/obj/machinery/firealarm/directional/south{ - dir = 2; - pixel_y = 25 - }, -/obj/item/food/grown/shell/gatfruit, -/obj/item/gun/ballistic/automatic/pistol/deagle, -/obj/item/gun/ballistic/revolver/russian, -/turf/open/floor/iron/dark, -/area/security/nuke_storage) "fhR" = ( /obj/structure/railing{ dir = 5 @@ -10733,24 +10993,6 @@ }, /turf/open/floor/iron/dark, /area/storage/primary) -"fia" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "fib" = ( /obj/effect/turf_decal/numbers/two_nine, /turf/open/floor/plating, @@ -10812,6 +11054,9 @@ "fjc" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "fjp" = ( @@ -10852,6 +11097,20 @@ /obj/structure/easel, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"flm" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 + }, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "flo" = ( /turf/closed/wall, /area/crew_quarters/heads/chief) @@ -10916,6 +11175,14 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) +"fnx" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "fnC" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -10974,14 +11241,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) -"fpH" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/obj/machinery/rnd/production/circuit_imprinter, -/obj/structure/window/reinforced, -/turf/open/floor/iron, -/area/engine/engineering) "fpO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -11019,27 +11278,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"fqz" = ( -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "fqC" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/disposalpipe/segment{ @@ -11105,25 +11343,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) -"fsF" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 8 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) -"fsU" = ( -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 1; - initialize_directions = 1 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/tech, -/area/engine/engineering) "fta" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -11207,6 +11426,17 @@ }, /turf/open/floor/plating, /area/security/prison) +"fuO" = ( +/obj/structure/sign/nanotrasen, +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface) +"fuQ" = ( +/obj/structure/fence/corner{ + dir = 5 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "fuT" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/drinks/bottle/beer{ @@ -11386,6 +11616,10 @@ /obj/structure/ladder, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"fzx" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface/grass) "fzZ" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4 @@ -11419,6 +11653,19 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/maintenance/disposal/incinerator) +"fAC" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "fBc" = ( /obj/structure/mirror{ pixel_x = -32; @@ -11435,6 +11682,19 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"fBA" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "fBG" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, @@ -11608,13 +11868,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/crew_quarters/dorms) -"fFh" = ( -/obj/item/reagent_containers/food/drinks/bottle/whiskey{ - pixel_x = -13; - pixel_y = -11 - }, -/turf/open/floor/plating/beach/sand, -/area/asteroid/paradise/surface/sand) "fFu" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/table/reinforced, @@ -11632,6 +11885,27 @@ }, /turf/open/openspace, /area/crew_quarters/kitchen) +"fGm" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "fGn" = ( /obj/machinery/door/airlock/vault{ name = "Vault Door"; @@ -11764,6 +12038,14 @@ dir = 8 }, /area/science/research) +"fKS" = ( +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ + pixel_x = -13; + pixel_y = -11 + }, +/obj/structure/chair/fancy/plastic, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface/sand) "fLl" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -11773,6 +12055,19 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/hop) +"fLs" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron, +/area/medical/medbay/central) "fLS" = ( /turf/closed/wall/r_wall, /area/ai_monitored/security/armory) @@ -11782,6 +12077,19 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) +"fMc" = ( +/obj/machinery/camera/autoname/directional/west{ + network = list("ss13","medbay") + }, +/obj/machinery/vending/medical, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/machinery/status_display/evac{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/medical/surgery) "fMh" = ( /obj/structure/ladder, /obj/structure/railing, @@ -11791,18 +12099,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "fMC" = ( @@ -11874,6 +12170,12 @@ "fMX" = ( /turf/closed/wall, /area/crew_quarters/dorms) +"fNB" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/open/openspace, +/area/maintenance/department/chapel) "fNN" = ( /obj/structure/chair/fancy/bench/pew/left{ dir = 1 @@ -11972,6 +12274,9 @@ dir = 1 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/carpet/purple, /area/crew_quarters/cafeteria) "fQo" = ( @@ -12023,20 +12328,6 @@ /obj/machinery/suit_storage_unit/mining/eva, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"fQH" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "fQP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -12086,16 +12377,10 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 + icon_state = "1-2" }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) @@ -12234,20 +12519,6 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/engine/atmos) -"fUG" = ( -/obj/effect/spawner/structure/window/reinforced, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoshutter"; - name = "CMO Office Shutters" - }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) "fUP" = ( /obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -12318,7 +12589,9 @@ name = "maintenance microwave"; pixel_y = 5 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -12360,6 +12633,18 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"fWn" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "fWy" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/air_input{ piping_layer = 2 @@ -12391,6 +12676,13 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"fWF" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "fWU" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12398,12 +12690,6 @@ /obj/structure/fence, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"fXo" = ( -/obj/effect/turf_decal/sand/plating, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "fXL" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -12423,6 +12709,14 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"fYP" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "fYS" = ( /obj/effect/turf_decal/box, /obj/machinery/shower{ @@ -12523,6 +12817,22 @@ /obj/machinery/digital_clock/directional/north, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"gaf" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 4 + }, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 32; + pixel_y = 29 + }, +/obj/item/kirbyplants/random, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "gaj" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -12596,15 +12906,16 @@ /obj/effect/turf_decal/tile/bar/opposingcorners, /turf/open/floor/iron/dark, /area/crew_quarters/kitchen) -"gcD" = ( -/obj/structure/railing/corner{ - dir = 1 +"gdb" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/railing/corner{ - dir = 8 +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 4 }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface) +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron, +/area/engine/engineering) "gdk" = ( /obj/machinery/hydroponics/constructable, /obj/effect/turf_decal/bot, @@ -12639,6 +12950,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"gdO" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "gdP" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/box/corners{ @@ -12716,12 +13035,6 @@ }, /turf/open/floor/plating, /area/security/brig) -"geB" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/bridge) "geJ" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -12784,17 +13097,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"ggo" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "ggs" = ( /turf/closed/wall/rust, /area/maintenance/department/engine) @@ -12872,6 +13174,11 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/bridge) +"giQ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "giS" = ( /turf/open/floor/plating/asteroid/planetary, /area/engine/atmos) @@ -13016,6 +13323,19 @@ /obj/item/circuitboard/machine/smes, /turf/open/floor/iron, /area/engine/engineering) +"glt" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/caution{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "glJ" = ( /obj/structure/table, /obj/item/stock_parts/subspace/filter, @@ -13142,6 +13462,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) +"gnb" = ( +/obj/machinery/computer/objective, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "gnc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13230,7 +13557,9 @@ /turf/open/floor/iron, /area/engine/atmos) "gpl" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable{ icon_state = "0-8" }, @@ -13252,17 +13581,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"gqj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "gqv" = ( /obj/effect/spawner/structure/window/depleteduranium, /turf/open/floor/plating, @@ -13281,6 +13599,10 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) +"grk" = ( +/obj/structure/lattice, +/turf/open/openspace, +/area/crew_quarters/heads/cmo) "grl" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 4 @@ -13294,6 +13616,13 @@ }, /turf/open/floor/pod/dark, /area/bridge/meeting_room) +"grx" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 5 + }, +/obj/machinery/meter, +/turf/closed/wall/r_wall, +/area/engine/supermatter) "grQ" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/sparsegrass, @@ -13305,6 +13634,21 @@ }, /turf/open/floor/iron/tech, /area/engine/atmos) +"gsi" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/effect/turf_decal/tile/red{ + alpha = 180; + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "gsF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -13560,6 +13904,9 @@ /area/science/mixing) "gyO" = ( /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "gzS" = ( @@ -13581,20 +13928,24 @@ /obj/machinery/light, /turf/open/floor/wood, /area/chapel/office) -"gAh" = ( -/obj/effect/turf_decal/pool{ +"gAf" = ( +/obj/effect/turf_decal/stripes/line{ dir = 8 }, -/obj/effect/turf_decal/stripes/line{ - dir = 8; - pixel_x = 4 +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/table, -/obj/item/storage/firstaid/brute{ - pixel_y = 5 +/obj/effect/turf_decal/numbers/two_nine{ + dir = 1 }, -/turf/open/floor/iron/white, -/area/crew_quarters/fitness/recreation) +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "gAn" = ( /obj/machinery/door/airlock/security{ name = "Evidence"; @@ -13612,6 +13963,16 @@ }, /turf/open/floor/iron/dark, /area/security/brig) +"gAp" = ( +/obj/structure/light_construct, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/pods{ + pixel_y = -32 + }, +/turf/open/floor/plating, +/area/vacant_room/office) "gAW" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -13657,7 +14018,9 @@ /turf/open/floor/plating/rust, /area/science/test_area) "gBO" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -13794,6 +14157,23 @@ }, /turf/open/floor/iron, /area/bridge/meeting_room) +"gEl" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/structure/table/reinforced, +/obj/item/book/manual/wiki/engineering_hacking{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ + pixel_x = 3; + pixel_y = -3 + }, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "gEN" = ( /turf/closed/wall, /area/maintenance/department/security/brig) @@ -13809,7 +14189,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 6 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -13951,6 +14333,10 @@ }, /turf/open/floor/iron, /area/maintenance/department/bridge) +"gIa" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "gIO" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/stripes/line{ @@ -14012,21 +14398,6 @@ }, /turf/open/floor/circuit/red, /area/ai_monitored/turret_protected/ai) -"gJt" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - alpha = 180 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "gJv" = ( /obj/structure/ladder, /turf/open/floor/pod/dark, @@ -14114,12 +14485,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"gMC" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) "gMG" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hor) @@ -14137,21 +14502,6 @@ /obj/structure/sign/departments/minsky/research/xenobiology, /turf/closed/wall, /area/science/xenobiology) -"gNi" = ( -/obj/structure/table/reinforced, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/window/reinforced, -/obj/item/clothing/glasses/meson/engine, -/obj/item/stack/sheet/mineral/copper{ - amount = 5; - pixel_x = -7; - pixel_y = 3 - }, -/obj/item/storage/belt/utility/full/engi, -/turf/open/floor/iron, -/area/engine/engineering) "gNq" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -14166,9 +14516,6 @@ /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) "gND" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/table, /obj/item/glove_box{ pixel_x = 8 @@ -14227,42 +14574,9 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron, /area/crew_quarters/dorms) -"gPq" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/bridge) "gPs" = ( /turf/open/floor/iron/tech, /area/engine/engineering) -"gPE" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/medical/surgery) "gPG" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -14315,19 +14629,6 @@ }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) -"gQn" = ( -/obj/structure/table/reinforced, -/obj/item/pipe_dispenser, -/obj/item/lightreplacer{ - pixel_x = 2; - pixel_y = 13 - }, -/obj/structure/window/reinforced, -/obj/structure/extinguisher_cabinet{ - pixel_x = 25 - }, -/turf/open/floor/iron, -/area/engine/engineering) "gQE" = ( /obj/structure/railing{ dir = 8 @@ -14353,6 +14654,20 @@ }, /turf/open/floor/noslip/standard, /area/science/lab) +"gQY" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "gRg" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -14365,13 +14680,15 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"gRo" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) +"gRw" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/rock/pile, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "gRR" = ( /obj/machinery/door/morgue{ dir = 1; @@ -14393,19 +14710,6 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"gSL" = ( -/obj/item/kirbyplants/random, -/obj/machinery/power/apc/auto_name/directional/west{ - pixel_x = -24 - }, -/obj/structure/cable/yellow, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "gTv" = ( /obj/structure/chair/fancy/sofa/old/left{ dir = 4 @@ -14491,6 +14795,18 @@ /area/security/brig) "gWa" = ( /turf/open/floor/grass/no_border, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) +"gWg" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/camera/autoname/directional/west, +/obj/machinery/digital_clock/directional/west, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) @@ -14527,23 +14843,6 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/medical/central) -"gWU" = ( -/obj/machinery/door/poddoor/shutters/radiation/preopen{ - id = "engsm"; - name = "Radiation Chamber Shutters" - }, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "Gas to Filter" - }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/effect/turf_decal/caution{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "gXb" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -14551,24 +14850,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/security/brig) -"gXc" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "gXg" = ( /obj/machinery/computer/bounty, /obj/effect/turf_decal/stripes/line, @@ -14634,7 +14915,9 @@ pixel_x = 1; pixel_y = 5 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/machinery/camera/directional/north{ network = list("ss13","security") }, @@ -14684,16 +14967,9 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) -"gYD" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, +"gYQ" = ( +/obj/structure/railing/corner, +/turf/open/floor/iron/dark/corner, /area/hallway/primary/central{ name = "-2 Primary Hallway" }) @@ -14717,6 +14993,28 @@ /obj/effect/decal/cleanable/generic, /turf/open/floor/plating/rust, /area/science/test_area) +"gZM" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) +"hag" = ( +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "ham" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -14742,6 +15040,21 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) +"haE" = ( +/obj/machinery/status_display/evac{ + pixel_x = -33 + }, +/obj/structure/table/wood, +/obj/machinery/recharger{ + pixel_x = -5; + pixel_y = 3 + }, +/obj/item/storage/fancy/cigarettes/cigars/havana{ + pixel_x = 13; + pixel_y = 9 + }, +/turf/open/floor/wood, +/area/crew_quarters/heads/captain) "haF" = ( /obj/structure/chair/stool/bar/directional/west, /obj/structure/extinguisher_cabinet{ @@ -14765,28 +15078,21 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"hbl" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/rack, -/obj/item/electronics/apc{ - pixel_x = 3; - pixel_y = 2 - }, -/obj/item/circuitboard/machine/rtg/advanced{ - pixel_x = -1; - pixel_y = -3 - }, -/obj/structure/sign/warning/explosives{ - pixel_y = -32 - }, -/turf/open/floor/iron/sepia, -/area/quartermaster/warehouse) "hbs" = ( /obj/structure/sign/painting/library{ pixel_y = -32 }, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) +"hbu" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/fireaxecabinet/directional/south, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/bridge) "hbL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -14799,19 +15105,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"hcF" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/rad_collector/anchored, -/turf/open/floor/plating, -/area/engine/supermatter) "hcI" = ( /obj/effect/turf_decal/siding/white{ alpha = 100; @@ -14924,10 +15217,27 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"hgw" = ( +/obj/machinery/light{ + dir = 8 + }, +/obj/structure/sign/map/echo{ + pixel_x = -32 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "hgB" = ( /obj/structure/sign/warning/fire, /turf/closed/wall/r_wall, /area/science/mixing) +"hgC" = ( +/obj/structure/fence{ + dir = 8 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "hgG" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -14938,6 +15248,11 @@ }, /turf/open/floor/iron, /area/bridge) +"hgS" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/sepia, +/area/quartermaster/storage) "hha" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -14999,6 +15314,15 @@ "hiB" = ( /turf/closed/wall, /area/asteroid/paradise) +"hiE" = ( +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "hjp" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Storage"; @@ -15026,6 +15350,14 @@ "hjU" = ( /turf/open/openspace, /area/science/mixing) +"hkG" = ( +/obj/effect/decal/cleanable/robot_debris/old{ + name = "Seamoth fragment"; + pixel_x = -3; + pixel_y = 5 + }, +/turf/open/floor/plating/beach/water, +/area/asteroid/paradise/surface/water) "hkP" = ( /obj/effect/turf_decal/bot, /obj/machinery/portable_atmospherics/canister/plasma, @@ -15063,12 +15395,26 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) -"hns" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 +"hmF" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/structure/railing{ + dir = 6; + layer = 4 }, +/obj/structure/closet/emcloset, +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"hns" = ( /obj/structure/disposalpipe/segment{ - dir = 2 + dir = 10 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, /turf/open/floor/iron/white, /area/medical/apothecary) @@ -15083,6 +15429,17 @@ /obj/structure/sign/departments/minsky/research/research, /turf/closed/wall/r_wall, /area/science/lab) +"hog" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = 32 + }, +/obj/item/kirbyplants/random{ + pixel_y = 22 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "hos" = ( /obj/machinery/power/terminal{ dir = 8 @@ -15098,9 +15455,14 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) +"how" = ( +/turf/closed/indestructible/rock/snow, +/area/space) "hoH" = ( /obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -15129,6 +15491,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) +"hoX" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "hph" = ( /obj/structure/bed{ dir = 8 @@ -15185,6 +15553,47 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) +"hpW" = ( +/obj/effect/turf_decal/box/white, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ + external_pressure_bound = 120; + name = "server vent" + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) +"hqd" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/paper_bin{ + pixel_x = -6; + pixel_y = 6 + }, +/obj/item/pen{ + pixel_x = -5; + pixel_y = 8 + }, +/obj/item/reagent_containers/glass/beaker{ + pixel_x = 6; + pixel_y = 10 + }, +/obj/item/reagent_containers/dropper{ + pixel_x = -3; + pixel_y = -4 + }, +/obj/item/reagent_containers/glass/beaker/large{ + pixel_x = 9; + pixel_y = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/item/clothing/glasses/science{ + pixel_x = -4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/science/lab) "hqu" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -15318,22 +15727,36 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"htB" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Chemistry Lab"; - req_access_txt = "33" +"htu" = ( +/obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ + alpha = 180; + color = "#DE3A3A" }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "1-4" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/structure/disposalpipe/segment{ dir = 2 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron, +/area/security/brig) +"htB" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Chemistry Lab"; + req_access_txt = "33" + }, +/obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/apothecary) "htC" = ( @@ -15366,6 +15789,22 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"huH" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 5 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "huR" = ( /obj/structure/lattice, /obj/structure/railing{ @@ -15381,26 +15820,14 @@ /turf/open/floor/iron, /area/maintenance/department/bridge) "hvh" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 +/obj/effect/turf_decal/siding/blue{ + dir = 10 }, /obj/machinery/light{ light_color = "#7AC3FF" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/digital_clock/directional/south, -/turf/open/floor/iron/white, +/turf/open/floor/glass/reinforced, /area/medical/medbay/central) "hvu" = ( /obj/structure/cable/yellow{ @@ -15447,28 +15874,25 @@ }, /turf/open/floor/iron, /area/maintenance/department/eva) -"hvZ" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "hwg" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/security/brig) +"hwq" = ( +/obj/structure/chair/fancy/bench/corporate/right{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "hwy" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -15600,14 +16024,6 @@ "hzQ" = ( /turf/open/floor/plating, /area/maintenance/department/engine) -"hAh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "hAp" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, @@ -15678,14 +16094,6 @@ luminosity = 2 }, /area/security/nuke_storage) -"hBv" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/bridge) "hBy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, @@ -15725,6 +16133,16 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/department/cargo) +"hCo" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "hCs" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -15760,17 +16178,6 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/quartermaster/storage) -"hDR" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/obj/item/radio/intercom{ - pixel_y = -33 - }, -/obj/machinery/light, -/turf/open/floor/iron/dark, -/area/engine/engineering) "hDY" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -15801,19 +16208,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"hFu" = ( -/obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_y = 7 - }, -/obj/item/clothing/gloves/color/black, -/obj/item/clothing/glasses/meson/engine, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) "hFP" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable/yellow{ @@ -15825,15 +16219,6 @@ }, /turf/open/floor/plating, /area/hallway/secondary/service) -"hGc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/sand/plating, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "hGq" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, @@ -15843,12 +16228,6 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/eva) -"hGN" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "hGZ" = ( /obj/machinery/air_sensor{ pixel_x = -32; @@ -15866,6 +16245,12 @@ }, /turf/open/floor/engine/vacuum, /area/maintenance/disposal/incinerator) +"hHp" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "hHO" = ( /obj/structure/railing{ dir = 1 @@ -15911,10 +16296,31 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) +"hIY" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/structure/closet/firecloset/full, +/obj/structure/railing{ + dir = 10; + layer = 4 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "hJA" = ( /obj/structure/window/reinforced, /turf/open/floor/engine, /area/science/xenobiology) +"hJJ" = ( +/obj/effect/turf_decal/sand/plating, +/obj/item/chair/plastic, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "hJN" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -15978,6 +16384,27 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/security/detectives_office) +"hLa" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "hLc" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance/two, @@ -16104,16 +16531,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"hOv" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "hPk" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/ausbushes/sparsegrass, @@ -16135,29 +16552,6 @@ "hQk" = ( /turf/open/floor/plating/rust, /area/science/mixing) -"hQO" = ( -/obj/machinery/door/airlock/command{ - name = "Chief Medical Officer's Office"; - req_access_txt = "40" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/door/firedoor, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "hRb" = ( /obj/effect/landmark/start/shaft_miner, /obj/effect/turf_decal/stripes/line{ @@ -16265,6 +16659,26 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating/rust, /area/science/mixing) +"hST" = ( +/obj/machinery/door/poddoor/shutters/radiation/preopen{ + id = "engsm"; + name = "Radiation Chamber Shutters" + }, +/obj/machinery/button/door{ + desc = "A remote control-switch for secure storage."; + id = "engsm"; + name = "Radiation shutters Toggle"; + pixel_y = 26; + req_access_txt = "11" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/caution{ + dir = 1 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "hSX" = ( /obj/structure/table/reinforced, /obj/machinery/door/poddoor/shutters{ @@ -16288,7 +16702,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -16360,25 +16776,10 @@ /turf/open/floor/plating, /area/medical/surgery) "hUj" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 +/obj/effect/turf_decal/siding/blue{ + dir = 6 }, -/turf/open/floor/iron/white, +/turf/open/floor/glass/reinforced, /area/medical/medbay/central) "hUk" = ( /obj/effect/turf_decal/stripes/line{ @@ -16452,6 +16853,14 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"hYz" = ( +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "hYK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Experimentation Chamber"; @@ -16519,15 +16928,34 @@ /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/science/central) -"hZV" = ( -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/structure/railing, -/obj/effect/turf_decal/siding/white, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 +"hZM" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 }, -/turf/open/floor/iron/white, -/area/science/lab) +/obj/machinery/power/port_gen/pacman, +/obj/effect/turf_decal/bot, +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 8 + }, +/obj/structure/cable/yellow, +/obj/item/stack/sheet/mineral/plasma/ten, +/obj/item/wrench{ + pixel_x = -4; + pixel_y = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"iad" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) +"ial" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "iao" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -16651,11 +17079,6 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) -"idO" = ( -/obj/machinery/portable_atmospherics/pump, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/engineering) "iej" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -16779,6 +17202,13 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"ihG" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "ihK" = ( /obj/structure/disposalpipe/trunk/multiz/down{ dir = 8 @@ -16851,7 +17281,9 @@ /turf/open/floor/iron/white, /area/medical/medbay/central) "ijF" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -16875,6 +17307,20 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"ijV" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/item/radio/intercom{ + pixel_y = -33 + }, +/obj/machinery/light, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "ikr" = ( /obj/structure/railing{ dir = 1 @@ -16899,6 +17345,22 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"ikz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface) +"ili" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "ill" = ( /obj/machinery/light{ dir = 1; @@ -16907,18 +17369,6 @@ /obj/effect/turf_decal/stripes/corner{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, /obj/item/kirbyplants/random, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) @@ -17005,17 +17455,6 @@ }, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) -"iox" = ( -/obj/structure/closet/emcloset/anchored, -/obj/structure/railing{ - dir = 10 - }, -/turf/open/floor/iron/dark/side{ - dir = 10 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "ioR" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -17028,23 +17467,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"ipm" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "ipu" = ( /obj/machinery/microwave{ desc = "Cooks and boils stuff, somehow."; @@ -17069,6 +17491,15 @@ }, /turf/open/openspace, /area/security/brig) +"ipT" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "irp" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -17245,6 +17676,13 @@ dir = 1; pixel_y = -29 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "iwI" = ( @@ -17316,6 +17754,19 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"iyC" = ( +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"iyL" = ( +/obj/item/kirbyplants/random, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "iyS" = ( /turf/closed/wall, /area/medical/exam_room) @@ -17324,6 +17775,17 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"izi" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "izj" = ( /turf/closed/wall, /area/science/misc_lab) @@ -17336,13 +17798,27 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"izt" = ( -/obj/structure/railing{ - dir = 5 +"iAz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/lattice, -/turf/open/openspace, -/area/maintenance/department/security/brig) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/bridge) "iAE" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17355,25 +17831,6 @@ name = "mainframe floor" }, /area/tcommsat/server) -"iAI" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "iAM" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -17425,26 +17882,6 @@ /obj/structure/frame/machine, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"iDi" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/medical/medbay/central) "iDI" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/rack, @@ -17549,7 +17986,9 @@ /obj/machinery/light{ dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -17567,6 +18006,15 @@ dir = 4 }, /area/bridge) +"iGw" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/chair/fancy/plastic{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "iGU" = ( /obj/effect/turf_decal/bot{ dir = 1 @@ -17587,24 +18035,6 @@ dir = 8 }, /area/science/lab) -"iHy" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/yellow/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "iIl" = ( /obj/machinery/vending/hydroseeds, /obj/effect/turf_decal/stripes/line, @@ -17629,6 +18059,17 @@ /obj/effect/turf_decal/trimline/blue/filled/warning, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) +"iIS" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "iIV" = ( /obj/item/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; @@ -17666,21 +18107,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) -"iJe" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 32; - pixel_y = 29 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "iJL" = ( /obj/machinery/light_switch{ pixel_x = 25; @@ -17746,6 +18172,20 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"iKU" = ( +/obj/machinery/door/airlock/medical{ + name = "Surgery Theatre"; + req_access_txt = "45" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/effect/mapping_helpers/airlock/unres, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/medical/surgery) "iKX" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -17791,28 +18231,6 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/science/research) -"iLL" = ( -/obj/item/wallframe/extinguisher_cabinet{ - pixel_x = 31; - pixel_y = 1 - }, -/obj/structure/closet/toolcloset, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/stack/sheet/iron/fifty{ - pixel_x = -5; - pixel_y = 3 - }, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/glass/fifty, -/obj/item/stack/sheet/wood/fifty, -/obj/item/stack/sheet/wood/fifty, -/obj/item/stack/rods/fifty, -/obj/item/bluespace_capsule, -/turf/open/floor/plating, -/area/vacant_room/office) "iMI" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 5 @@ -17877,6 +18295,24 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) +"iOD" = ( +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/obj/effect/turf_decal/tile/dark_blue{ + alpha = 180; + dir = 4 + }, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"iPj" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/tech, +/area/engine/engineering) "iPs" = ( /obj/effect/turf_decal/siding/dark, /obj/effect/turf_decal/siding/dark{ @@ -17889,32 +18325,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"iPB" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/card/id/job/atmospheric_technician, -/obj/item/clothing/mask/gas{ - pixel_x = -4; - pixel_y = 10 - }, -/obj/item/tank/internals/plasma{ - pixel_x = 7; - pixel_y = 21 - }, -/obj/item/clothing/head/beret/atmos{ - pixel_x = 4; - pixel_y = -2 - }, -/turf/open/floor/iron, -/area/engine/engineering) -"iPI" = ( -/obj/machinery/computer/card, -/obj/item/storage/secure/safe{ - pixel_x = 5; - pixel_y = 32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "iPK" = ( /obj/structure/flora/ausbushes/ywflowers, /obj/effect/decal/cleanable/dirt, @@ -17947,13 +18357,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/chapel) -"iQo" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/lattice, -/turf/open/openspace, -/area/maintenance/department/security/brig) "iQq" = ( /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/evac, @@ -17961,6 +18364,15 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"iQr" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Engineering Foyer"; + req_one_access_txt = "32" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/tech, +/area/engine/engineering) "iRc" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -18041,6 +18453,19 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) +"iTy" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "iTz" = ( /obj/structure/closet/crate/coffin, /obj/machinery/door/window/eastleft{ @@ -18055,28 +18480,6 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted, /turf/open/floor/iron, /area/security/brig) -"iTL" = ( -/obj/item/radio/intercom{ - pixel_y = 30 - }, -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/obj/structure/table/wood, -/obj/item/flashlight/lamp/green{ - pixel_x = -6; - pixel_y = 14 - }, -/obj/item/bikehorn/rubberducky{ - pixel_x = -7; - pixel_y = 4 - }, -/obj/item/storage/photo_album{ - pixel_x = 3; - pixel_y = -1 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/captain/private) "iUt" = ( /obj/structure/railing, /turf/open/openspace, @@ -18114,6 +18517,16 @@ }, /turf/open/floor/iron, /area/maintenance/department/medical/central) +"iUO" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "iUP" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18212,6 +18625,14 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"iXD" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "iYl" = ( /obj/structure/sink{ dir = 1; @@ -18222,6 +18643,10 @@ }, /turf/open/floor/prison/dark, /area/security/prison/shielded) +"iYn" = ( +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "iYo" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ alpha = 180 @@ -18275,7 +18700,9 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "iZg" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -18363,15 +18790,6 @@ /obj/machinery/power/rad_collector, /turf/open/floor/iron/dark, /area/engine/engineering) -"jaK" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 5 - }, -/turf/open/floor/wood, -/area/crew_quarters/cafeteria) "jaU" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -18414,18 +18832,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"jdU" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jeo" = ( /obj/structure/chair/stool/directional/west, /obj/effect/turf_decal/siding/wood{ @@ -18433,18 +18839,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"jeF" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "jeN" = ( /obj/structure/cable/yellow{ icon_state = "1-4" @@ -18485,12 +18879,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) -"jgJ" = ( -/obj/structure/railing{ - dir = 10 - }, -/turf/open/openspace, -/area/crew_quarters/heads/cmo) "jhG" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2, /obj/machinery/atmospherics/components/binary/pump{ @@ -18500,10 +18888,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/dark, /area/engine/atmos) -"jhN" = ( -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, -/turf/open/floor/iron/tech, -/area/engine/engineering) "jhV" = ( /obj/structure/railing/corner{ dir = 1 @@ -18517,16 +18901,21 @@ "jij" = ( /turf/open/openspace, /area/security/brig) +"jiz" = ( +/obj/structure/stairs{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/pod/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "jiG" = ( /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 6 }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"jjc" = ( -/obj/structure/girder, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "jjj" = ( /obj/structure/noticeboard{ desc = "A board for remembering the fallen of the station."; @@ -18552,14 +18941,15 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/science/server) -"jkq" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 +"jkt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing/corner{ + dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 +/turf/open/floor/iron/dark/corner{ + dir = 4 }, -/turf/open/floor/iron, /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) @@ -18572,8 +18962,8 @@ /area/tcommsat/server) "jkD" = ( /obj/item/toy/plush/moth/firewatch{ - pixel_x = -10; - name = "Zinnia" + name = "Zinnia"; + pixel_x = -10 }, /obj/item/toy/plush/lizard_plushie{ name = "Walks-upon-Embers"; @@ -18581,6 +18971,32 @@ }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"jkI" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock/atmos/glass{ + req_access_txt = "11" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "jkK" = ( /obj/machinery/light_switch{ pixel_x = -24; @@ -18697,6 +19113,17 @@ }, /turf/open/floor/iron, /area/security/brig) +"jnM" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "jnO" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ dir = 4 @@ -18721,6 +19148,14 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) +"joi" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "jor" = ( /obj/structure/lattice/catwalk/over, /obj/structure/chair/foldable{ @@ -18739,25 +19174,16 @@ }, /turf/open/floor/plating, /area/security/brig) -"joF" = ( -/obj/structure/lattice/catwalk/over, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","security") - }, -/turf/open/openspace, -/area/maintenance/department/security/brig) "joL" = ( /obj/structure/flora/rock/pile, /turf/closed/mineral/random/air, /area/asteroid/paradise) -"jpU" = ( -/obj/structure/railing/corner{ - dir = 4 +"jpr" = ( +/obj/structure/railing{ + dir = 8 }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "jqb" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -18766,6 +19192,12 @@ /obj/machinery/smartfridge/extract/preloaded, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) +"jqp" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "jqA" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -18792,6 +19224,9 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) +"jqW" = ( +/turf/closed/wall/mineral/plastitanium, +/area/asteroid/paradise/surface) "jqY" = ( /obj/structure/extinguisher_cabinet{ pixel_y = -1 @@ -18818,6 +19253,21 @@ }, /turf/open/floor/iron/tech, /area/engine/engineering) +"jrl" = ( +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ + dir = 4 + }, +/obj/structure/table/reinforced, +/obj/item/paper_bin{ + pixel_x = -5; + pixel_y = 5 + }, +/obj/item/book/manual/wiki/security_space_law{ + pixel_x = 7; + pixel_y = 6 + }, +/turf/open/floor/iron, +/area/security/brig) "jrq" = ( /obj/effect/turf_decal/tile/yellow/opposingcorners{ dir = 8 @@ -18829,6 +19279,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron/dark, /area/storage/primary) +"jrB" = ( +/obj/effect/turf_decal/pool{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8; + pixel_x = 4 + }, +/obj/item/storage/firstaid/brute{ + pixel_y = 5 + }, +/obj/structure/closet/boxinggloves, +/turf/open/floor/iron/white, +/area/crew_quarters/fitness/recreation) "jrE" = ( /obj/structure/table/wood, /obj/item/reagent_containers/food/condiment/peppermill{ @@ -18857,6 +19321,11 @@ /obj/effect/spawner/lootdrop/costume, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"jrL" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor/border_only, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) "jrU" = ( /obj/machinery/smartfridge, /turf/closed/wall, @@ -18916,6 +19385,19 @@ /obj/item/trash/plate, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) +"jso" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/evac{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "jsp" = ( /turf/closed/indestructible/rock/bedrock, /area/asteroid/paradise) @@ -19003,21 +19485,12 @@ }, /turf/open/floor/wood, /area/crew_quarters/dorms) -"jwj" = ( -/obj/machinery/light{ - dir = 8 - }, -/obj/machinery/portable_atmospherics/canister/nitrogen, -/obj/item/wrench, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 4 +"jwG" = ( +/obj/structure/railing/corner{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/turf/open/openspace, +/area/medical/medbay/central) "jwL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters{ @@ -19236,6 +19709,8 @@ "jAB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/chapel) "jAN" = ( @@ -19278,18 +19753,34 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating/rust, /area/science/test_area) +"jDe" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack, +/obj/item/electronics/apc{ + pixel_x = 3; + pixel_y = 2 + }, +/obj/structure/sign/warning/explosives{ + pixel_y = -32 + }, +/turf/open/floor/iron/sepia, +/area/quartermaster/warehouse) "jDq" = ( /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_one_access_txt = "7;29;12" - }, /turf/open/floor/plating, /area/maintenance/department/chapel) +"jDz" = ( +/obj/item/seeds/tower, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "jDC" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -19310,18 +19801,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"jDL" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jDU" = ( /obj/machinery/door/morgue{ name = "Confession Booth" @@ -19337,6 +19816,14 @@ }, /turf/open/floor/wood, /area/chapel/main) +"jEa" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "jEr" = ( /obj/machinery/light{ dir = 4 @@ -19595,19 +20082,27 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) -"jHZ" = ( -/obj/structure/railing/corner{ - dir = 8 +"jIs" = ( +/obj/machinery/atmospherics/components/unary/portables_connector/visible{ + dir = 1 }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/pump, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"jIW" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/turf/open/floor/iron/dark/side{ - dir = 8 +/obj/structure/cable{ + icon_state = "1-4" }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "jJH" = ( /obj/structure/chair/stool/directional/west, /obj/effect/landmark/start/assistant, @@ -19616,33 +20111,6 @@ dir = 9 }, /area/asteroid/paradise/surface) -"jJL" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/structure/disposalpipe/junction{ - dir = 8 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jJR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -19657,6 +20125,21 @@ /obj/machinery/space_heater, /turf/open/floor/iron/dark, /area/engine/atmos) +"jKl" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 10 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/dark/corner{ + dir = 4 + }, +/obj/machinery/light/small, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "jKp" = ( /turf/open/floor/iron/dark, /area/hallway/primary/central{ @@ -19732,9 +20215,6 @@ /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/structure/table, /obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -2; @@ -19790,7 +20270,9 @@ /turf/open/floor/iron/sepia, /area/quartermaster/storage) "jMw" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "4-8" }, @@ -19813,6 +20295,10 @@ "jME" = ( /turf/closed/wall, /area/medical/apothecary) +"jMW" = ( +/obj/structure/sign/departments/medbay/alt, +/turf/closed/wall/r_wall, +/area/medical/medbay/central) "jNd" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ @@ -19857,29 +20343,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, /area/security/execution/education) -"jOz" = ( -/obj/machinery/portable_atmospherics/scrubber, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron/tech, -/area/engine/engineering) -"jOC" = ( -/obj/item/radio/intercom{ - pixel_x = 33; - pixel_y = -2 - }, -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "jOI" = ( /obj/effect/turf_decal/bot, /obj/structure/table, @@ -19908,16 +20371,6 @@ }, /turf/open/floor/iron/dark, /area/science/robotics) -"jOP" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/plating/asteroid/planetary, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "jPg" = ( /obj/effect/turf_decal/delivery, /obj/structure/closet/crate/mail, @@ -19986,6 +20439,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"jRA" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "jRB" = ( /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, @@ -20021,7 +20479,6 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/grille/broken, /turf/open/floor/plating, /area/maintenance/department/chapel) "jTj" = ( @@ -20060,6 +20517,16 @@ }, /turf/open/floor/iron/grid/steel, /area/science/mixing) +"jTE" = ( +/obj/effect/turf_decal/box, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating, +/area/engine/engineering) "jUk" = ( /obj/effect/landmark/start/assistant, /obj/structure/cable/yellow{ @@ -20092,6 +20559,29 @@ "jUw" = ( /turf/open/floor/plating/asteroid/basalt/planetary, /area/quartermaster/storage) +"jUL" = ( +/obj/item/radio/intercom{ + pixel_x = 33; + pixel_y = -3 + }, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "jUM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable{ @@ -20138,6 +20628,18 @@ }, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) +"jVJ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "jVL" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -20301,6 +20803,17 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) +"jZf" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/effect/turf_decal/bot, +/obj/structure/sign/departments/minsky/supply/hydroponics{ + pixel_x = 32 + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "jZh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -20392,6 +20905,21 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"kaW" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "kbq" = ( /obj/structure/sign/warning/radiation/rad_area, /turf/closed/wall/r_wall, @@ -20480,17 +21008,12 @@ /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 6 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) +"kdO" = ( +/obj/structure/sink/puddle, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "kef" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -20522,6 +21045,29 @@ "kfl" = ( /turf/closed/wall/r_wall, /area/bridge/meeting_room) +"kfK" = ( +/obj/structure/table, +/obj/item/geiger_counter{ + pixel_x = 6; + pixel_y = 3 + }, +/obj/item/toy/plush/plushvar{ + pixel_x = -2; + pixel_y = 9 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "kgl" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -20536,15 +21082,6 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"kgq" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/numbers/two_nine{ - pixel_y = 16 - }, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "kgt" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/cut{ @@ -20595,6 +21132,10 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) +"khr" = ( +/obj/item/sbeacondrop/exploration, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "khs" = ( /turf/closed/wall/rust, /area/science/lab) @@ -20628,6 +21169,12 @@ "kkD" = ( /turf/closed/mineral/bscrystal, /area/asteroid/paradise) +"kkJ" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "kkN" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow, @@ -20638,16 +21185,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"klr" = ( -/obj/machinery/ore_silo, -/obj/effect/turf_decal/delivery, -/obj/structure/sign/warning/securearea{ - pixel_y = -32 - }, -/turf/open/floor/circuit/green{ - luminosity = 2 - }, -/area/security/nuke_storage) "klE" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -20701,16 +21238,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"kmz" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/closet/firecloset/full, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "kmN" = ( /obj/effect/landmark/event_spawn, /obj/effect/turf_decal/siding/wood{ @@ -20770,6 +21297,17 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"knl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "knv" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -20807,17 +21345,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"koo" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/light/small, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "koJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -20827,17 +21354,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"koS" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/numbers{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "kpC" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/railing, @@ -20948,12 +21464,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"kqX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/ausbushes/lavendergrass, -/obj/structure/flora/tree/jungle, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) "krj" = ( /obj/item/trash/boritos, /turf/open/floor/plating/beach/sand, @@ -20977,12 +21487,14 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"krV" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise/surface) +"krW" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "ksj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -21002,24 +21514,6 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) -"ktf" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "kti" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/status_display/evac{ @@ -21067,6 +21561,13 @@ }, /turf/open/floor/plating, /area/security/warden) +"ktV" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "ktY" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, @@ -21077,6 +21578,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/quartermaster/sorting) +"kuu" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "kuD" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Telecommunications"; @@ -21120,13 +21629,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"kvt" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "kvM" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/bot, @@ -21160,6 +21662,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/carpet/royalblack, /area/vacant_room/office) +"kwz" = ( +/obj/machinery/firealarm/directional/south, +/obj/machinery/portable_atmospherics/pump, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/tech, +/area/engine/engineering) "kwK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21246,6 +21754,17 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"kxR" = ( +/obj/structure/table, +/obj/item/stack/package_wrap, +/obj/effect/decal/cleanable/dirt, +/obj/item/hand_labeler, +/obj/item/food/grown/tea, +/obj/item/food/grown/grapes, +/obj/item/food/grown/cherries, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "kxS" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) @@ -21256,6 +21775,10 @@ }, /turf/open/floor/iron, /area/maintenance/department/security/brig) +"kyp" = ( +/obj/effect/landmark/loneops, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface/grass) "kyr" = ( /obj/machinery/door/window/brigdoor/northright{ id = "Cell 1"; @@ -21280,14 +21803,6 @@ /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"kyT" = ( -/obj/machinery/light_switch{ - pixel_x = 25; - pixel_y = 40 - }, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/medical/surgery) "kyY" = ( /obj/machinery/newscaster{ pixel_x = 1; @@ -21304,30 +21819,40 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"kzr" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/junction/flip, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 6; + piping_layer = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "kzA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"kzD" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +"kzK" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" + icon_state = "1-2" }, -/obj/structure/disposalpipe/junction{ +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/dark_green/anticorner/contrasted{ dir = 4 }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "kzL" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -21341,7 +21866,9 @@ /obj/effect/turf_decal/tile/purple{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -21386,6 +21913,9 @@ /obj/machinery/atmospherics/components/unary/cryo_cell{ piping_layer = 2 }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "kAX" = ( @@ -21404,14 +21934,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"kBh" = ( -/obj/structure/stairs{ - dir = 4 - }, -/turf/open/floor/pod/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "kBm" = ( /obj/machinery/computer/aifixer{ dir = 8 @@ -21493,25 +22015,6 @@ /obj/structure/fence/cut/large, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) -"kCq" = ( -/obj/effect/decal/cleanable/dirt, -/obj/structure/table, -/obj/item/pipe_dispenser{ - pixel_x = 1; - pixel_y = 12 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/clothing/glasses/meson{ - pixel_y = 1 - }, -/obj/item/clothing/glasses/meson{ - pixel_y = 1 - }, -/obj/item/clothing/glasses/meson{ - pixel_x = 2 - }, -/turf/open/floor/iron, -/area/engine/engineering) "kCM" = ( /turf/open/floor/plating, /area/quartermaster/warehouse) @@ -21540,7 +22043,9 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -21581,6 +22086,11 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/bridge) +"kFv" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "kGr" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -21610,30 +22120,40 @@ }, /turf/open/floor/plating, /area/science/robotics) -"kHm" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ +"kHe" = ( +/obj/effect/turf_decal/evac{ dir = 1 }, -/obj/structure/table/glass, -/obj/item/folder/blue, -/obj/item/flashlight/pen, -/obj/item/clothing/neck/stethoscope, -/obj/item/computer_hardware/hard_drive/role/medical{ - pixel_x = 3 +/turf/open/floor/iron, +/area/maintenance/department/engine) +"kHt" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/obj/item/computer_hardware/hard_drive/role/medical{ - pixel_x = -3 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 }, -/obj/item/computer_hardware/hard_drive/role/chemistry{ - pixel_y = 6 +/obj/structure/cable{ + icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/cable{ + icon_state = "2-4" }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 10 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) +"kHD" = ( +/obj/structure/chair{ + dir = 4 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/science/mixing) "kHF" = ( /obj/machinery/portable_atmospherics/canister/plasma, /obj/effect/turf_decal/delivery, @@ -21681,6 +22201,23 @@ }, /turf/open/floor/noslip/standard, /area/quartermaster/storage) +"kIV" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Chamber" + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "kJA" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -21756,6 +22293,18 @@ }, /turf/open/floor/iron/white, /area/medical/storage) +"kKL" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/tech, +/area/engine/engineering) "kKY" = ( /obj/item/clothing/shoes/sandal{ pixel_x = -18 @@ -21777,12 +22326,9 @@ }, /turf/open/floor/iron, /area/science/misc_lab) -"kLF" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface/grass) +"kLl" = ( +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "kLU" = ( /turf/open/floor/iron, /area/engine/atmos) @@ -21801,23 +22347,23 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/maintenance/disposal/incinerator) -"kMR" = ( +"kMU" = ( +/turf/closed/wall/r_wall/rust, +/area/science/mixing) +"kMZ" = ( /obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ +/obj/effect/landmark/start/assistant, +/turf/open/floor/iron/dark/corner{ dir = 1 }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" }) -"kMU" = ( -/turf/closed/wall/r_wall/rust, -/area/science/mixing) +"kNb" = ( +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "kNj" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -21880,6 +22426,13 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"kPl" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron, +/area/maintenance/department/crew_quarters/bar) "kPn" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -21895,15 +22448,6 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"kPr" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) "kPB" = ( /obj/machinery/mineral/stacking_machine{ input_dir = 8; @@ -21914,6 +22458,26 @@ }, /turf/open/floor/plating, /area/maintenance/disposal) +"kPR" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + name = "HOS"; + sortType = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/effect/turf_decal/numbers{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "kPS" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -21962,6 +22526,15 @@ "kQw" = ( /turf/closed/wall, /area/maintenance/department/medical/morgue) +"kQJ" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "kQZ" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -22001,6 +22574,14 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/dark, /area/security/brig) +"kSY" = ( +/obj/structure/table, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "kTG" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -22008,7 +22589,7 @@ "kTN" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "12;22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/cable/yellow{ @@ -22023,6 +22604,17 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/iron, /area/hallway/secondary/service) +"kUg" = ( +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "kUn" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/ausbushes/sparsegrass, @@ -22120,10 +22712,6 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) -"kWE" = ( -/obj/effect/turf_decal/stripes/line, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "kWH" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -22150,6 +22738,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron/dark, /area/engineering/hallway{ name = "Engineering Viewing Platform" @@ -22158,28 +22749,27 @@ /obj/machinery/hydroponics/soil, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"kXq" = ( -/obj/structure/table, -/obj/item/wrench{ - pixel_x = -4; - pixel_y = 15 - }, -/obj/item/crowbar/red{ - pixel_x = -2; - pixel_y = 11 - }, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/analyzer{ - pixel_x = 1 +"kXp" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 5 }, -/turf/open/floor/iron, -/area/engine/engineering) +/turf/closed/wall, +/area/engine/supermatter) "kXu" = ( /obj/machinery/vending/autodrobe/all_access, /obj/machinery/airalarm/directional/north, /obj/machinery/camera/directional/north, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) +"kXP" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "kXQ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -22268,6 +22858,18 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) +"lal" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "laI" = ( /obj/machinery/conveyor/inverted{ dir = 10; @@ -22316,6 +22918,12 @@ /obj/item/kitchen/rollingpin, /turf/open/floor/iron, /area/hallway/secondary/service) +"lbv" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "lbA" = ( /obj/structure/disposalpipe/segment{ dir = 2 @@ -22368,19 +22976,6 @@ }, /turf/open/floor/plating, /area/engine/engineering) -"ldw" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating, -/area/science/mixing) "lea" = ( /obj/item/beacon{ pixel_y = 3 @@ -22448,16 +23043,13 @@ }, /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) -"lfX" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner{ - dir = 8 +"lfV" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 4 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "lgq" = ( /obj/effect/turf_decal/stripes/box, /obj/machinery/mineral/ore_redemption{ @@ -22501,6 +23093,19 @@ }, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) +"lgS" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 6 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "lhc" = ( /obj/structure/railing{ dir = 8 @@ -22539,17 +23144,34 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, /turf/open/floor/iron/white, /area/science/explab) +"lhv" = ( +/obj/structure/railing{ + dir = 4 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "lhB" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"lhR" = ( +/obj/effect/landmark/xeno_spawn, +/obj/machinery/atmospherics/components/unary/vent_pump/on{ + dir = 4 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "lii" = ( /obj/machinery/computer/secure_data{ dir = 8 @@ -22614,10 +23236,6 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/science/central) -"liZ" = ( -/obj/structure/railing, -/turf/open/openspace, -/area/crew_quarters/heads/cmo) "lji" = ( /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, /obj/effect/decal/cleanable/dirt/dust, @@ -22634,18 +23252,13 @@ /obj/effect/spawner/room/threexfive, /turf/open/floor/plating, /area/maintenance/department/bridge) +"ljz" = ( +/obj/effect/landmark/loneops, +/turf/open/floor/plating/beach/sand, +/area/asteroid/paradise/surface/sand) "ljQ" = ( /turf/closed/wall, /area/maintenance/department/eva) -"ljY" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "lku" = ( /obj/structure/bodycontainer/morgue{ dir = 2 @@ -22658,6 +23271,16 @@ }, /turf/open/floor/iron/white, /area/science/robotics) +"lkw" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "llb" = ( /obj/item/paper/fluff/holodeck/disclaimer{ pixel_x = -4; @@ -22668,25 +23291,6 @@ }, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"lll" = ( -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/railing, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "lly" = ( /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -22724,20 +23328,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"lmb" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/plating, -/area/quartermaster/warehouse) "lmC" = ( /obj/structure/railing{ dir = 6 @@ -22809,7 +23399,9 @@ alpha = 180; dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -22828,7 +23420,9 @@ dir = 4 }, /obj/effect/turf_decal/stripes/line, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /turf/open/floor/iron/tech, /area/science/mixing/chamber) @@ -22863,36 +23457,9 @@ }, /turf/open/floor/iron/dark, /area/engine/atmos) -"lol" = ( -/obj/machinery/door/airlock/medical{ - name = "Surgery Theatre"; - req_access_txt = "45" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/effect/mapping_helpers/airlock/unres, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron, -/area/medical/surgery) "loD" = ( /turf/closed/wall, /area/vacant_room/office) -"loO" = ( -/obj/structure/light_construct, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/vacant_room/office) "loS" = ( /obj/structure/railing{ dir = 4 @@ -22928,7 +23495,9 @@ dir = 8 }, /obj/machinery/rnd/production/techfab/department/cargo, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -22971,18 +23540,19 @@ }, /turf/open/floor/iron, /area/janitor) -"lrR" = ( -/obj/machinery/door/poddoor/shutters/preopen{ - id = "cmoshutter"; - name = "CMO Office Shutters" - }, -/obj/effect/spawner/structure/window, -/turf/open/floor/plating, -/area/crew_quarters/heads/cmo) "lsj" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) +"lsm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/ausbushes/lavendergrass, +/obj/structure/flora/tree/jungle, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "lsu" = ( /obj/machinery/computer/bank_machine{ dir = 1 @@ -23012,11 +23582,19 @@ /obj/item/reagent_containers/glass/bucket, /turf/open/floor/prison/dark, /area/security/prison) -"lsH" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron, -/area/maintenance/department/engine) +"lsV" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "ltd" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -23027,21 +23605,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"lts" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "ltt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, @@ -23080,6 +23643,19 @@ "luF" = ( /turf/open/floor/iron, /area/maintenance/department/medical/morgue) +"lvc" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/item/wrench, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 8 + }, +/obj/machinery/portable_atmospherics/canister/nitrogen, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/tech, +/area/engine/engineering) "lvj" = ( /obj/structure/bookcase/random/adult, /turf/open/floor/plating, @@ -23111,10 +23687,12 @@ }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"lwh" = ( -/obj/machinery/space_heater, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) +"lwo" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "lwX" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/machinery/door/airlock/medical/glass{ @@ -23193,6 +23771,15 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"lyd" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "lys" = ( /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, @@ -23208,13 +23795,6 @@ /obj/item/plunger, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) -"lyE" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/lattice, -/turf/open/openspace, -/area/maintenance/department/security/brig) "lyG" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/effect/turf_decal/stripes/line, @@ -23245,6 +23825,41 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/engine) +"lyZ" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 1 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) +"lzi" = ( +/obj/machinery/door/poddoor/shutters{ + id = "exploration" + }, +/obj/machinery/button/door{ + desc = "A remote control switch."; + id = "exploration"; + name = "Exploration Shuttle Shutters"; + pixel_y = 24 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) +"lzp" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/closet/emcloset, +/obj/structure/sign/map/echo{ + pixel_y = 32 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "lAn" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/girder, @@ -23280,13 +23895,42 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"lAM" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/components/binary/pump/on{ + dir = 8; + name = "Gas to Filter" + }, +/obj/effect/turf_decal/delivery, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "lAN" = ( /turf/closed/wall/mineral/wood, /area/asteroid/paradise/surface) +"lAS" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/tech, +/area/science/mixing) "lBD" = ( /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/three, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -23315,6 +23959,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/maintenance/department/bridge) +"lCB" = ( +/turf/closed/wall/r_wall/rust, +/area/asteroid/paradise) "lCL" = ( /obj/structure/railing, /obj/effect/turf_decal/tile/blue/half{ @@ -23376,6 +24023,21 @@ }, /turf/open/floor/plating, /area/security/brig) +"lDA" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 9 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"lDM" = ( +/obj/structure/fence/corner{ + dir = 1 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "lDU" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 4 @@ -23388,26 +24050,12 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"lEa" = ( -/obj/structure/extinguisher_cabinet{ - pixel_x = -30 - }, -/obj/effect/decal/cleanable/cobweb, -/obj/item/storage/pod{ - pixel_x = 5; - pixel_y = 32 - }, -/obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 4; - pixel_y = 3 - }, -/obj/item/pen{ - pixel_x = 4; - pixel_y = 4 +"lEc" = ( +/obj/structure/fence{ + dir = 8 }, -/turf/open/floor/iron, -/area/medical/surgery) +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "lEg" = ( /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat/foyer) @@ -23515,19 +24163,15 @@ }, /turf/open/floor/wood, /area/vacant_room/office) -"lGE" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "lGG" = ( /turf/open/floor/prison, /area/security/prison) +"lHB" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/chapel) "lHU" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable/yellow{ @@ -23599,8 +24243,13 @@ /turf/open/floor/iron/dark, /area/engine/atmos) "lKm" = ( -/obj/structure/disposalpipe/segment{ - dir = 8 +/obj/structure/disposalpipe/junction, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) @@ -23652,6 +24301,9 @@ }, /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface/grass) +"lNu" = ( +/turf/closed/wall/r_wall, +/area/medical/medbay/central) "lOf" = ( /obj/structure/sign/departments/minsky/security/command, /turf/closed/wall/r_wall, @@ -23686,16 +24338,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/ai_upload) -"lON" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/machinery/suit_storage_unit/cmo, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "lOO" = ( /obj/structure/table/glass, /obj/item/clothing/neck/stethoscope{ @@ -23741,6 +24383,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"lPj" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/sign/warning/pods{ + pixel_x = 1; + pixel_y = 32 + }, +/turf/open/floor/plating, +/area/maintenance/department/science/xenobiology) "lPu" = ( /obj/structure/railing{ dir = 4 @@ -23783,6 +24439,24 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"lQd" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/west, +/obj/structure/sign/warning/nosmoking/circle{ + pixel_x = -32 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "lQi" = ( /turf/open/floor/carpet/purple, /area/crew_quarters/dorms) @@ -23796,6 +24470,19 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"lQr" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "lQx" = ( /obj/machinery/computer/atmos_alert{ dir = 1 @@ -23839,6 +24526,15 @@ /obj/effect/landmark/start/captain, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain/private) +"lRf" = ( +/obj/machinery/atmospherics/components/unary/shuttle/heater{ + dir = 1 + }, +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "lRg" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, @@ -23899,6 +24595,15 @@ }, /turf/open/floor/iron/dark, /area/science/mixing) +"lTh" = ( +/obj/effect/turf_decal/siding/dark, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "lTB" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/fancy/comfy{ @@ -23935,10 +24640,6 @@ }, /turf/open/floor/prison, /area/security/prison) -"lUh" = ( -/obj/effect/spawner/lootdrop/grille_or_trash, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "lUm" = ( /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) @@ -23998,17 +24699,6 @@ /obj/structure/railing/corner, /turf/open/openspace, /area/medical/medbay/central) -"lVB" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/item/radio/intercom{ - pixel_y = 20 - }, -/obj/item/kirbyplants/random, -/obj/machinery/light{ - dir = 1 - }, -/turf/open/floor/iron, -/area/medical/surgery) "lVP" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/cable/yellow{ @@ -24030,17 +24720,6 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/department/bridge) -"lVT" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "lVX" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -24065,11 +24744,20 @@ dir = 8 }, /area/asteroid/paradise/surface) +"lWF" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "lWH" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/bridge) +"lWK" = ( +/obj/structure/fence, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "lWU" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/effect/decal/cleanable/food/tomato_smudge, @@ -24104,18 +24792,39 @@ /obj/structure/displaycase/labcage, /turf/open/floor/iron/white, /area/crew_quarters/heads/hor) -"lYc" = ( -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ +"lYg" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/railing/corner{ dir = 8 }, -/obj/structure/sign/painting/library{ - pixel_x = 1; - pixel_y = -32 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, -/turf/open/floor/iron, -/area/medical/surgery) +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-16" + }, +/obj/effect/turf_decal/trimline/yellow, +/obj/effect/landmark/start/station_engineer, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "lYF" = ( /obj/machinery/power/terminal{ dir = 1 @@ -24145,6 +24854,13 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"mab" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/flora/rock/pile, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "man" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ @@ -24225,19 +24941,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) -"mcX" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "mcZ" = ( /obj/effect/turf_decal/tile/blue{ dir = 4 @@ -24315,6 +25018,19 @@ "mev" = ( /turf/closed/wall/r_wall, /area/quartermaster/qm) +"mfh" = ( +/obj/effect/turf_decal/siding/dark/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/siding/yellow/corner{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "mgk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -24329,22 +25045,10 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/maintenance/department/bridge) -"mgp" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/turf_decal/numbers/two_nine{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +"mgu" = ( +/obj/effect/landmark/loneops, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface/grass) "mgK" = ( /obj/structure/railing, /turf/open/openspace, @@ -24587,6 +25291,16 @@ /obj/effect/decal/cleanable/robot_debris, /turf/open/floor/plating/airless, /area/science/mixing) +"moh" = ( +/obj/machinery/firealarm/directional/east, +/obj/effect/spawner/lootdrop/grille_or_trash, +/turf/open/floor/plating, +/area/maintenance/department/medical/central) +"mon" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "moy" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 8 @@ -24600,6 +25314,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"moC" = ( +/obj/effect/turf_decal/siding/yellow, +/obj/effect/turf_decal/trimline/yellow/warning, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "moQ" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -24635,13 +25359,27 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"mpq" = ( +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/computer/operating{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = -27 + }, +/turf/open/floor/iron, +/area/medical/surgery) "mpz" = ( /obj/structure/table, /obj/structure/bedsheetbin, /obj/effect/turf_decal/siding/white{ alpha = 100 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -24662,6 +25400,19 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) +"mrp" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, +/obj/machinery/meter, +/obj/machinery/atmospherics/pipe/manifold/general/visible{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/atmos) "mrx" = ( /obj/structure/railing/corner{ dir = 8 @@ -24724,43 +25475,12 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"mth" = ( -/obj/effect/turf_decal/box/white, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/effect/landmark/start/medical_doctor, -/turf/open/floor/iron/white, -/area/medical/surgery) "mtn" = ( /obj/structure/sign/warning/nosmoking{ pixel_x = 1 }, /turf/closed/wall, /area/medical/storage) -"mtH" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180; - dir = 4 - }, -/obj/machinery/newscaster{ - pixel_y = 33 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/rnd/production/techfab/department/security, -/turf/open/floor/iron/dark, -/area/security/warden) "mtK" = ( /obj/structure/table/reinforced, /obj/item/computer_hardware/hard_drive/role/engineering{ @@ -24783,9 +25503,6 @@ /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/chief) "mtO" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/apothecary) "muw" = ( @@ -24796,19 +25513,6 @@ }, /turf/open/indestructible/sound/pool/end, /area/crew_quarters/fitness/recreation) -"muR" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/bridge) "mvf" = ( /obj/machinery/cryopod{ dir = 4 @@ -24887,6 +25591,22 @@ /obj/structure/flora/grass/jungle/b, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) +"mxu" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/turf/open/floor/iron, +/area/medical/surgery) "mxy" = ( /obj/effect/turf_decal/tile/bar/opposingcorners, /obj/machinery/vending/dinnerware, @@ -24968,6 +25688,30 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"myX" = ( +/obj/structure/table/optable{ + pixel_y = 7 + }, +/obj/item/surgical_drapes{ + pixel_y = 4 + }, +/obj/machinery/light, +/obj/item/clothing/gloves/color/latex{ + pixel_x = -1; + pixel_y = -1 + }, +/turf/open/floor/iron, +/area/medical/surgery) +"myY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/evac/evac_big{ + dir = 4 + }, +/turf/open/floor/plating, +/area/maintenance/department/eva) "mzo" = ( /obj/structure/railing{ dir = 5 @@ -24977,22 +25721,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"mzu" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "mzC" = ( /obj/effect/spawner/xmastree, /turf/open/floor/wood, @@ -25150,6 +25878,9 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron/dark, /area/engine/engineering) "mEr" = ( @@ -25210,6 +25941,16 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"mFz" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "mFB" = ( /obj/structure/table/glass, /obj/item/book/manual/wiki/grenades{ @@ -25250,6 +25991,16 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/medical/apothecary) "mFI" = ( @@ -25302,6 +26053,11 @@ }, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"mHA" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/iron/tech, +/area/engine/engineering) "mHK" = ( /obj/machinery/keycard_auth{ pixel_x = 33; @@ -25430,12 +26186,6 @@ /obj/structure/disposalpipe/trunk, /turf/open/floor/iron, /area/janitor) -"mKi" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) "mKy" = ( /obj/structure/no_effect_signpost{ name = "Echo station"; @@ -25482,6 +26232,9 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"mMf" = ( +/turf/open/floor/plating/dirt/jungle/wasteland, +/area/asteroid/paradise/surface) "mMl" = ( /obj/structure/bed, /obj/item/bedsheet/hop, @@ -25563,14 +26316,32 @@ }, /turf/open/floor/engine, /area/science/xenobiology) -"mNP" = ( +"mNS" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/layer_manifold/visible{ + dir = 4 + }, +/obj/structure/table, +/obj/item/clothing/mask/gas{ + pixel_x = -4; + pixel_y = 10 + }, +/obj/item/analyzer{ + pixel_x = 1 + }, +/obj/item/crowbar/red{ + pixel_x = -2; + pixel_y = 11 + }, +/obj/item/tank/internals/plasma{ + pixel_x = 7; + pixel_y = 7 + }, /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 1 - }, /turf/open/floor/iron/dark, /area/engine/engineering) "mOp" = ( @@ -25579,18 +26350,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/dock/drydock, /area/quartermaster/storage) -"mOA" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/airalarm/kitchen_cold_room{ - dir = 1; - pixel_y = 24 - }, -/turf/open/floor/iron/freezer, -/area/crew_quarters/kitchen/coldroom) "mOQ" = ( /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt/dust, @@ -25608,6 +26367,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"mPv" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "mQm" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -25763,6 +26529,11 @@ }, /turf/open/floor/prison/dark, /area/security/prison) +"mTe" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "mTi" = ( /obj/structure/lattice/catwalk/over, /turf/open/openspace, @@ -25786,21 +26557,10 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"mVd" = ( -/obj/structure/railing{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) +"mUP" = ( +/obj/machinery/door/airlock/shuttle, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "mVg" = ( /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/asteroid/planetary, @@ -25819,6 +26579,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/bridge) +"mVt" = ( +/obj/structure/cable/yellow{ + icon_state = "1-16" + }, +/obj/effect/turf_decal/trimline/yellow, +/obj/machinery/light/small{ + dir = 4 + }, +/turf/open/floor/pod/dark, +/area/maintenance/department/medical/morgue) "mWc" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 1 @@ -25908,6 +26678,19 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/central) +"mYe" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "mYL" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, @@ -25941,6 +26724,15 @@ /mob/living/simple_animal/slime, /turf/open/floor/engine, /area/science/xenobiology) +"mZC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "mZT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -25961,8 +26753,34 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 1 }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/wood, /area/crew_quarters/heads/captain) +"naW" = ( +/obj/effect/turf_decal/box/white, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/effect/landmark/start/medical_doctor, +/turf/open/floor/iron/white, +/area/medical/surgery) +"naX" = ( +/obj/item/kirbyplants/random, +/obj/machinery/light/small{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "nbf" = ( /obj/machinery/door/window/southleft{ dir = 1; @@ -26030,15 +26848,6 @@ /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron/white, /area/medical/medbay/central) "ncM" = ( @@ -26119,22 +26928,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"neA" = ( -/obj/structure/flora/rock/pile, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) -"neD" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/effect/turf_decal/tile/purple/half/contrasted, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "neX" = ( /turf/open/floor/iron/dark/side{ dir = 5 @@ -26142,6 +26935,17 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"nfQ" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "nfX" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -26184,6 +26988,12 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) +"nhl" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 9 + }, +/turf/closed/wall, +/area/engine/supermatter) "nhs" = ( /obj/effect/turf_decal/stripes/corner{ dir = 8 @@ -26199,6 +27009,31 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/engine, /area/ai_monitored/turret_protected/ai) +"nhz" = ( +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/newscaster{ + pixel_y = -30 + }, +/obj/effect/turf_decal/bot{ + dir = 1 + }, +/obj/machinery/light, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) +"nhC" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/medical/medbay/central) "nhY" = ( /mob/living/basic/mothroach{ density = 0; @@ -26232,12 +27067,22 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) -"njB" = ( +"niR" = ( +/obj/machinery/light, +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","rd") + }, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 5 + dir = 8 }, -/turf/open/floor/plating, -/area/space/nearstation) +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "nkb" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -26270,6 +27115,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/side, /area/science/lab) +"nlE" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/openspace, +/area/maintenance/department/security/brig) "nlH" = ( /obj/structure/chair/fancy/comfy{ dir = 4 @@ -26301,18 +27152,12 @@ /obj/machinery/light/small, /turf/open/floor/plating, /area/engine/engineering) -"nmp" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/dark/corner, -/obj/structure/cable/yellow{ - icon_state = "1-2" +"nmv" = ( +/obj/structure/sign/poster/official/moth8{ + pixel_y = 31 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) "nmz" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -26376,6 +27221,16 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"nnQ" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "nnR" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, @@ -26441,6 +27296,10 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) +"npY" = ( +/obj/machinery/atmospherics/pipe/manifold/cyan/visible, +/turf/open/floor/iron/tech, +/area/engine/engineering) "nqa" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/machinery/camera/autoname{ @@ -26508,6 +27367,25 @@ }, /turf/open/floor/iron/dark, /area/security/warden) +"nrA" = ( +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) +"nrK" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/effect/spawner/structure/window, +/obj/structure/curtain/directional{ + color = "#ACD1E9"; + dir = 8; + icon_state = "bathroom-open"; + icon_type = "bathroom" + }, +/turf/open/floor/plating, +/area/medical/surgery) "nrQ" = ( /turf/closed/wall/mineral/titanium/survival/nodiagonal, /area/hallway/primary/fore{ @@ -26546,6 +27424,12 @@ }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"nub" = ( +/obj/item/kirbyplants/random, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "nuD" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/misc/assistantformal, @@ -26585,6 +27469,13 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/plating, /area/vacant_room/office) +"nvz" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/evac{ + dir = 4 + }, +/turf/open/floor/iron, +/area/maintenance/department/engine) "nvB" = ( /obj/structure/railing, /obj/machinery/light{ @@ -26607,7 +27498,9 @@ /area/maintenance/department/science/central) "nww" = ( /obj/effect/turf_decal/bot, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -26616,12 +27509,6 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) -"nwE" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) "nwN" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -26847,6 +27734,16 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"nCU" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "nDA" = ( /obj/structure/table, /obj/machinery/fax/service, @@ -26905,6 +27802,14 @@ /obj/item/bedsheet/dorms, /turf/open/floor/wood, /area/asteroid/paradise/surface) +"nFm" = ( +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "nFv" = ( /obj/machinery/firealarm/directional/north, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ @@ -26918,9 +27823,32 @@ }, /turf/open/floor/iron, /area/security/brig) +"nFx" = ( +/obj/structure/window/plasma/reinforced{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 8 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "nFR" = ( /turf/closed/wall/r_wall/rust, /area/science/explab) +"nFX" = ( +/obj/structure/railing/corner, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/effect/turf_decal/siding/white/corner, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 5 + }, +/turf/open/floor/iron/white, +/area/science/lab) "nGn" = ( /obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -7; @@ -26958,6 +27886,14 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, /area/maintenance/department/engine) +"nHh" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 1 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "nHi" = ( /turf/closed/wall, /area/gateway) @@ -27026,6 +27962,28 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"nIe" = ( +/obj/machinery/light/small, +/obj/structure/table, +/obj/machinery/cell_charger, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/storage/box/lights/mixed{ + pixel_x = 4; + pixel_y = 6 + }, +/obj/item/stack/cable_coil, +/obj/item/stack/cable_coil{ + pixel_x = 3; + pixel_y = -7 + }, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/effect/turf_decal/stripes/corner{ + dir = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "nIh" = ( /obj/machinery/vending/hydronutrients, /obj/effect/turf_decal/stripes/line{ @@ -27074,6 +28032,29 @@ }, /turf/open/openspace, /area/crew_quarters/heads/hor) +"nIC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/item/clothing/under/rank/cargo/exploration{ + pixel_x = 5; + pixel_y = -3 + }, +/obj/item/radio/headset/headset_exploration{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/effect/decal/cleanable/blood/gibs/torso, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) +"nIF" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "nIN" = ( /obj/machinery/door/airlock/command{ name = "Head of Security's Office"; @@ -27110,6 +28091,27 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) +"nJy" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/bridge) "nJX" = ( /obj/effect/mapping_helpers/airlock/unres{ dir = 8 @@ -27148,6 +28150,19 @@ /obj/structure/flora/rock, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"nKs" = ( +/obj/structure/window/plasma/reinforced{ + dir = 8 + }, +/obj/structure/cable{ + icon_state = "0-4" + }, +/obj/machinery/power/rad_collector/anchored, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/turf/open/floor/plating, +/area/engine/supermatter) "nKB" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/sepia/planetary{ @@ -27190,14 +28205,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"nLv" = ( -/obj/structure/flora/rock/pile, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "nMm" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -27225,6 +28232,22 @@ /obj/structure/railing, /turf/open/openspace, /area/ai_monitored/turret_protected/aisat/maint) +"nNY" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/loading_area{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) +"nOn" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/status_display/evac{ + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/security/brig) "nOq" = ( /obj/structure/window/reinforced{ dir = 8 @@ -27272,6 +28295,40 @@ }, /turf/open/floor/wood, /area/asteroid/paradise/surface) +"nQB" = ( +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/structure/railing, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) +"nQC" = ( +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) +"nQI" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/sign/warning/securearea, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "nQV" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, @@ -27338,22 +28395,6 @@ /obj/effect/decal/cleanable/greenglow/filled, /turf/open/floor/iron/white, /area/medical/apothecary) -"nSK" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8; - name = "HOP"; - sortType = 15 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/corner{ - dir = 4 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "nTt" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -27398,11 +28439,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"nVc" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/barricade/wooden, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "nVd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/closet/cardboard, @@ -27410,17 +28446,6 @@ /obj/item/paicard, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"nVe" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/rad_collector/anchored, -/turf/open/floor/plating, -/area/engine/supermatter) "nVn" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -27465,6 +28490,9 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/asteroid/paradise/surface) +"nWb" = ( +/turf/closed/wall/r_wall, +/area/maintenance/department/cargo) "nWu" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27505,21 +28533,18 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) -"nXM" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, +"nYi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, -/obj/structure/cable{ - icon_state = "2-4" - }, -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) +/obj/structure/flora/tree/jungle/small, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "nYl" = ( /obj/effect/turf_decal/tile/black/opposingcorners{ dir = 1 @@ -27578,6 +28603,30 @@ /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/department/medical/central) +"nZZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/machinery/atmospherics/pipe/manifold/general/visible, +/obj/machinery/atmospherics/components/binary/pump/on/layer4{ + dir = 8; + name = "Waste to Filter" + }, +/obj/machinery/atmospherics/components/binary/pump/on/layer2{ + dir = 4; + name = "Air to Distro"; + target_pressure = 500 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/general/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "oam" = ( /turf/closed/wall/r_wall, /area/teleporter) @@ -27658,18 +28707,19 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/white, /area/medical/medbay/central) +"ocv" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "ocx" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 10 }, /turf/closed/wall, /area/engine/supermatter) -"ocI" = ( -/obj/structure/railing{ - dir = 4 - }, -/turf/open/floor/plating/grass, -/area/asteroid/paradise/surface/grass) "ocL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/rock/pile, @@ -27709,15 +28759,77 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"ofn" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/structure/disposalpipe/segment{ +"oer" = ( +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 5; + pixel_y = 4 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -3; + pixel_y = 3 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -5; + pixel_y = 1 + }, +/obj/item/stack/sheet/plasteel{ + amount = 10; + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/glass/fifty{ + pixel_x = -2; + pixel_y = -1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 1; + pixel_y = 1 + }, +/obj/item/stack/sheet/iron/fifty{ + pixel_x = 4; + pixel_y = -1 + }, +/obj/item/stack/rods/fifty, +/obj/structure/table, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"oeG" = ( +/obj/structure/railing/corner{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" }) +"oeL" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) +"ofC" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/decal/cleanable/blood/old, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "ofE" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/railing, @@ -27767,6 +28879,19 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/security/brig) +"ogE" = ( +/obj/machinery/airalarm/engine{ + dir = 8; + pixel_x = -23 + }, +/obj/machinery/light/small, +/obj/machinery/atmospherics/components/binary/pump{ + dir = 1; + name = "Gas to Filter" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/engine/supermatter) "ogJ" = ( /obj/effect/turf_decal/delivery, /obj/effect/turf_decal/stripes/corner, @@ -27788,6 +28913,16 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/science/robotics) +"ohx" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/patients_rooms) "ohC" = ( /obj/effect/decal/cleanable/blood/gibs/body, /turf/open/floor/plating/dirt/planetary, @@ -27841,6 +28976,17 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/medical/morgue) +"oju" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/rnd/production/protolathe/department/engineering{ + req_access_txt = "32" + }, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "ojw" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -27866,6 +29012,26 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/dorms) +"okt" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Medbay Maintenance"; + req_access_txt = "5" + }, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "quarantineshutters"; + name = "isolation shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/turf/open/floor/iron, +/area/maintenance/department/medical/central) "okx" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -27955,17 +29121,21 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/pod/dark, /area/maintenance/department/cargo) -"onj" = ( -/obj/effect/turf_decal/stripes/line{ +"onw" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 6 + }, +/obj/effect/turf_decal/siding/dark/corner{ dir = 1 }, -/obj/structure/window/reinforced, -/obj/structure/disposalpipe/segment, -/obj/machinery/rnd/production/protolathe/department/engineering{ - req_access_txt = "32" +/obj/effect/turf_decal/trimline/dark/corner{ + dir = 1 }, -/turf/open/floor/iron, -/area/engine/engineering) +/obj/machinery/light/small, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "onx" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge Access"; @@ -28119,6 +29289,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"oqm" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -32; + pixel_y = -1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "oqn" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 32; @@ -28153,17 +29330,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"oqs" = ( -/obj/structure/railing/corner, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "oqF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/trimline/yellow, @@ -28320,6 +29486,18 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/heads/hos) +"otu" = ( +/mob/living/simple_animal/chicken/turkey{ + atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0); + desc = "A veteran of Nanotrasen's Animal Experimentation Program that attempted to replicate the organic space suit that some hostile entities are known to have exhibited, Tom now serves Nanotrasen as the mascot of the Exploration Crew."; + health = 200; + maxHealth = 200; + melee_damage = 5; + minbodytemp = 2.7; + name = "Tom" + }, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "otW" = ( /obj/effect/turf_decal/box, /obj/machinery/holopad, @@ -28378,6 +29556,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/lab) +"ove" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8; + pixel_x = 4 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/rock/pile, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "ovg" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -28444,22 +29631,6 @@ }, /turf/open/floor/plating, /area/quartermaster/storage) -"owG" = ( -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Maintenance Hatch"; - req_access_txt = "12"; - security_level = 6 - }, -/obj/structure/lattice/catwalk/over, -/turf/open/floor/plating, -/area/maintenance/department/security/brig) -"owJ" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/reagent_dispensers/water_cooler, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "oxf" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -28517,10 +29688,8 @@ /turf/open/floor/iron/dark, /area/maintenance/department/crew_quarters/dorms) "oyg" = ( -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 1 - }, /obj/effect/landmark/start/medical_doctor, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "oyk" = ( @@ -28690,27 +29859,6 @@ }, /turf/open/floor/iron, /area/medical/genetics/cloning) -"oBX" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/machinery/hydroponics/constructable, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) -"oCj" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/corner{ - dir = 8 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "oCE" = ( /turf/open/openspace, /area/engine/atmos) @@ -28722,6 +29870,12 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"oDI" = ( +/obj/structure/fence/corner{ + dir = 6 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "oDR" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -28793,6 +29947,20 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/iron/white, /area/science/xenobiology) +"oEI" = ( +/obj/structure/chair/fancy/bench/corporate/left{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "oEJ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -28895,6 +30063,15 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/quartermaster/warehouse) +"oHn" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/machinery/portable_atmospherics/canister, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer2{ + dir = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "oHx" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -29002,6 +30179,21 @@ /obj/structure/window/plasma/reinforced, /turf/open/floor/iron, /area/engine/atmos) +"oKf" = ( +/obj/structure/closet/secure_closet/hop, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/item/modular_computer/tablet/pda, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "oKy" = ( /obj/machinery/holopad, /obj/effect/turf_decal/stripes/line{ @@ -29024,35 +30216,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"oLa" = ( -/obj/structure/table/reinforced, -/obj/item/folder/white{ - pixel_x = -5 - }, -/obj/item/holosign_creator/medical{ - pixel_x = -4; - pixel_y = 17 - }, -/obj/item/toy/figure/cmo{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/stamp/cmo{ - pixel_x = -2 - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen{ - desc = "Used for monitoring medbay to ensure patient safety."; - dir = 1; - name = "Medbay Monitor"; - network = list("medbay"); - pixel_x = 1; - pixel_y = -32 - }, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "oLi" = ( /obj/effect/turf_decal/caution/stand_clear, /obj/structure/cable/yellow{ @@ -29095,6 +30258,17 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"oLC" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "oLK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/chair/stool/directional/west, @@ -29221,25 +30395,6 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) -"oNr" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/effect/landmark/start/quartermaster, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "oNs" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -29285,6 +30440,15 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/dorms) +"oOz" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/turf/open/floor/iron/showroomfloor, +/area/crew_quarters/fitness/recreation) "oOA" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /mob/living/simple_animal/hostile/retaliate/frog{ @@ -29322,6 +30486,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/grass/no_border, /area/crew_quarters/heads/chief) +"oPa" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "oPi" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -29349,6 +30521,10 @@ }, /turf/open/floor/iron/grid/steel, /area/bridge) +"oPp" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "oPC" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ @@ -29387,6 +30563,18 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"oQF" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/firealarm/directional/south, +/obj/machinery/light, +/obj/machinery/atmospherics/pipe/simple/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "oQQ" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13","security") @@ -29405,9 +30593,6 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "oRp" = ( -/obj/machinery/airalarm/directional/east{ - pixel_x = 24 - }, /obj/effect/decal/cleanable/oil, /obj/machinery/food_cart, /turf/open/floor/plating, @@ -29427,20 +30612,14 @@ }, /turf/open/floor/wood, /area/chapel/main) -"oRx" = ( -/obj/item/beacon{ - pixel_y = 3 - }, -/turf/open/floor/wood, -/area/crew_quarters/cafeteria) -"oRV" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/side{ - dir = 10 +"oRT" = ( +/obj/structure/fence{ + dir = 8 }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/structure/sign/warning/securearea, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "oSY" = ( /obj/machinery/door/poddoor/shutters{ id = "commissaryshutters0"; @@ -29458,6 +30637,12 @@ }, /turf/open/floor/plating, /area/crew_quarters/cafeteria) +"oTq" = ( +/obj/effect/turf_decal/numbers/two_nine, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "oTt" = ( /obj/structure/closet/crate, /obj/item/stack/sheet/animalhide/mothroach, @@ -29557,23 +30742,6 @@ /obj/item/radio, /turf/open/floor/iron/dark, /area/gateway) -"oWG" = ( -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","engine") - }, -/obj/item/radio/intercom{ - pixel_x = 33; - pixel_y = -2 - }, -/obj/machinery/meter, -/obj/machinery/light_switch{ - pixel_x = 23 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 1 - }, -/turf/open/floor/engine, -/area/engine/supermatter) "oXd" = ( /obj/structure/railing{ dir = 9 @@ -29599,13 +30767,21 @@ /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/eva) -"oYA" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 +"oYL" = ( +/obj/structure/cable{ + icon_state = "1-2" }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible/layer2{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, /area/engine/engineering) "oYP" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -29654,15 +30830,6 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/plating, /area/maintenance/department/eva) -"oZt" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/manifold4w/cyan/visible/layer2, -/obj/machinery/meter, -/obj/machinery/atmospherics/pipe/manifold/general/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "oZJ" = ( /obj/item/stack/sheet/iron/fifty{ pixel_x = -2; @@ -29738,17 +30905,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/eva) -"paJ" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "paK" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ @@ -29772,13 +30928,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"paX" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/iron, -/area/maintenance/department/chapel) "pbk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -29822,16 +30971,14 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/hydroponics) -"pch" = ( -/obj/machinery/light/small, -/turf/open/floor/iron/tech, -/area/engine/engineering) "pcu" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 +/obj/effect/turf_decal/siding/white/corner{ + dir = 1 }, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/siding/blue{ + dir = 9 + }, +/turf/open/floor/glass/reinforced, /area/medical/medbay/central) "pcy" = ( /obj/effect/decal/cleanable/dirt/dust, @@ -29874,12 +31021,6 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) -"pdk" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 5 - }, -/turf/closed/wall/r_wall, -/area/engine/supermatter) "pdm" = ( /turf/open/floor/plating/beach/coastline_t/sandwater_inner{ dir = 8 @@ -29923,13 +31064,26 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"pfb" = ( +"pei" = ( +/obj/item/seeds/tea, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"pfq" = ( +/obj/structure/table/reinforced, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 4 + }, /obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron/dark/side, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/obj/machinery/microwave{ + pixel_x = -2; + pixel_y = 5 + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/prison/dark, +/area/security/prison) "pfN" = ( /obj/structure/window/reinforced{ dir = 1 @@ -29952,6 +31106,30 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/atmos) +"pgl" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/lattice/catwalk/over, +/turf/open/openspace, +/area/maintenance/department/security/brig) +"pgp" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + alpha = 180; + dir = 8 + }, +/obj/item/kirbyplants/random, +/obj/structure/sign/map/echo{ + pixel_y = -32 + }, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "pgy" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/lavendergrass, @@ -30003,7 +31181,9 @@ /turf/closed/wall/rust, /area/maintenance/disposal) "piY" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -30196,6 +31376,15 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/cryopods) +"ppX" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "pqi" = ( /obj/structure/stairs, /turf/open/floor/pod/dark, @@ -30206,23 +31395,13 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/crew_quarters/cafeteria) -"prf" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 9 - }, -/turf/closed/wall/r_wall, -/area/engine/supermatter) -"prw" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 +"prd" = ( +/obj/structure/chair/fancy/shuttle{ + dir = 1 }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "psm" = ( /obj/effect/spawner/lootdrop/aimodule_neutral, /obj/effect/spawner/lootdrop/aimodule_neutral, @@ -30331,18 +31510,7 @@ pixel_x = 24; pixel_y = 24 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron/white, /area/medical/apothecary) "ptP" = ( @@ -30523,35 +31691,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/chapel/main) -"pAw" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = -6; - pixel_y = 6 - }, -/obj/item/pen{ - pixel_x = -5; - pixel_y = 8 - }, -/obj/item/reagent_containers/glass/beaker{ - pixel_x = 6; - pixel_y = 10 - }, -/obj/item/reagent_containers/dropper{ - pixel_x = -3; - pixel_y = -4 - }, -/obj/item/reagent_containers/glass/beaker/large{ - pixel_x = 9; - pixel_y = 1 - }, -/obj/effect/turf_decal/stripes/line, -/obj/item/clothing/glasses/science{ - pixel_x = -4 - }, -/turf/open/floor/iron, -/area/science/lab) "pAy" = ( /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron/techmaint/planetary, @@ -30563,18 +31702,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/disposal) -"pBc" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/turf/open/floor/plating, -/area/engine/supermatter) "pBg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -30614,6 +31741,16 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/green, /area/crew_quarters/cafeteria) +"pBL" = ( +/obj/item/barcodescanner{ + name = "Scanner"; + pixel_x = -2; + pixel_y = 3 + }, +/turf/open/floor/plating/beach/coastline_t/sandwater_inner{ + dir = 8 + }, +/area/asteroid/paradise/surface) "pCa" = ( /obj/machinery/door/airlock/engineering/glass/critical{ heat_proof = 1; @@ -30814,6 +31951,12 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"pGF" = ( +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 6 + }, +/turf/closed/wall, +/area/engine/supermatter) "pHe" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/door/airlock/maintenance_hatch{ @@ -30914,18 +32057,11 @@ /obj/effect/spawner/structure/window, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"pJO" = ( -/obj/structure/cable/yellow{ - icon_state = "1-16" - }, -/obj/effect/turf_decal/trimline/yellow, -/obj/machinery/light/small{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable/yellow, -/turf/open/floor/pod/dark, -/area/maintenance/department/medical/morgue) +"pIB" = ( +/obj/effect/spawner/structure/window/plasma/reinforced, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/plating, +/area/engine/supermatter) "pKj" = ( /obj/structure/flora/rock/pile, /obj/effect/turf_decal/sand/plating, @@ -30955,7 +32091,9 @@ /turf/open/floor/carpet/blue, /area/crew_quarters/cafeteria) "pKx" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -30969,6 +32107,20 @@ }, /turf/open/floor/iron/dark, /area/science/robotics) +"pKz" = ( +/obj/machinery/door/window/brigdoor/southright{ + dir = 4; + name = "Command Chair"; + req_access_txt = "19" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/bridge) "pKX" = ( /obj/machinery/light{ dir = 4 @@ -31027,13 +32179,6 @@ /obj/machinery/vending/medical, /turf/open/floor/iron, /area/medical/storage) -"pLM" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "pLT" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -31058,15 +32203,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"pMc" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing{ - dir = 4 - }, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "pMt" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -31106,7 +32242,9 @@ pixel_x = 14; pixel_y = 5 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /turf/open/floor/carpet/green, /area/chapel/main) @@ -31186,6 +32324,21 @@ }, /turf/open/floor/iron/white, /area/science/research) +"pOA" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "pPs" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/trimline/yellow, @@ -31202,10 +32355,34 @@ }, /turf/open/floor/iron, /area/maintenance/department/security/brig) +"pPR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "pQk" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) +"pQS" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 9 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) +"pRe" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "pRW" = ( /obj/structure/chair/office{ dir = 4 @@ -31256,6 +32433,11 @@ "pSY" = ( /turf/open/floor/plating, /area/maintenance/department/chapel) +"pTs" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "pTv" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -31300,6 +32482,13 @@ }, /turf/open/floor/iron, /area/medical/surgery) +"pTU" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "pTV" = ( /obj/structure/lattice/catwalk/over, /obj/structure/railing/corner{ @@ -31407,18 +32596,24 @@ /area/maintenance/disposal/incinerator) "pVj" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, /turf/open/floor/iron, /area/maintenance/department/engine) -"pVO" = ( -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 +"pVC" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 }, -/turf/open/floor/plating, -/area/space/nearstation) +/obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/medical/surgery) "pVY" = ( /turf/closed/wall, /area/engine/engineering) @@ -31537,6 +32732,29 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/captain) +"pXA" = ( +/obj/effect/decal/cleanable/dirt, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"pXK" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/iron/tech, +/area/engine/atmos) "pXQ" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -31558,34 +32776,11 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/engine/atmos) -"pYO" = ( -/obj/machinery/computer/security/mining, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron, -/area/bridge) "pZC" = ( /obj/structure/closet, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/central) -"pZI" = ( -/obj/structure/flora/ausbushes/sunnybush, -/obj/structure/window/reinforced{ - dir = 8 - }, -/obj/structure/window/reinforced{ - dir = 4 - }, -/turf/open/floor/grass/no_border, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "qah" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -31719,6 +32914,13 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/atmos) +"qdf" = ( +/obj/machinery/power/smes, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "qdG" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/techstorage/RnD_secure, @@ -31753,17 +32955,44 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"qdZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/open/floor/iron/grid/steel, +/area/medical/medbay/central) "qeb" = ( /obj/effect/spawner/structure/window, /obj/structure/barricade/wooden/crude, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) +"qey" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/turf/closed/wall/r_wall, +/area/crew_quarters/heads/cmo) "qeO" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"qeW" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "qfj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -31794,6 +33023,19 @@ /obj/machinery/flasher/portable, /turf/open/floor/iron/dark, /area/ai_monitored/security/armory) +"qge" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/railing{ + dir = 4 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/dark, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "qgj" = ( /obj/structure/flora/ausbushes/lavendergrass, /obj/structure/flora/ausbushes/ywflowers, @@ -31854,6 +33096,13 @@ pixel_x = -4; pixel_y = 3 }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "qhy" = ( @@ -31887,6 +33136,20 @@ "qhT" = ( /turf/closed/wall/r_wall, /area/maintenance/department/security/brig) +"qiD" = ( +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/light_switch{ + pixel_x = 25; + pixel_y = 40 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/medical/surgery) "qiO" = ( /obj/effect/turf_decal/siding/white{ dir = 1 @@ -31925,6 +33188,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) +"qjr" = ( +/obj/structure/window/reinforced/survival_pod{ + dir = 1 + }, +/obj/structure/frame, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "qjF" = ( /obj/structure/railing{ dir = 8 @@ -31945,6 +33215,20 @@ }, /turf/open/floor/engine/plasma, /area/engine/atmos) +"qjP" = ( +/obj/machinery/requests_console{ + department = "Cargo Bay"; + departmentType = 2; + pixel_y = 29 + }, +/obj/machinery/computer/cargo, +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/machinery/firealarm/directional/east, +/turf/open/floor/iron/dark, +/area/quartermaster/storage) "qjR" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -31976,6 +33260,20 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"qki" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ + dir = 8 + }, +/obj/machinery/door/airlock/public/glass/incinerator{ + frequency = null; + req_access_txt = "11"; + req_one_access = null + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "qkM" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -31985,6 +33283,14 @@ }, /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) +"qlb" = ( +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cmoshutter"; + name = "CMO Office Shutters" + }, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, +/area/medical/medbay/central) "qlg" = ( /obj/effect/turf_decal/tile/neutral{ dir = 8 @@ -32010,6 +33316,13 @@ /obj/structure/fans/tiny, /turf/open/floor/iron/techmaint/planetary, /area/science/mixing) +"qlO" = ( +/obj/item/seeds/flower/harebell, +/obj/machinery/light/small, +/obj/effect/turf_decal/delivery, +/obj/machinery/hydroponics, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "qmd" = ( /obj/structure/railing{ dir = 4 @@ -32026,6 +33339,12 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"qms" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "qmz" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -32118,10 +33437,6 @@ }, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"qrl" = ( -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/sepia, -/area/quartermaster/storage) "qrO" = ( /obj/machinery/conveyor{ dir = 4; @@ -32134,7 +33449,9 @@ /area/quartermaster/storage) "qsx" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -32146,6 +33463,13 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/crew_quarters/dorms) +"qsz" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "qsE" = ( /obj/structure/sign/directions/science{ dir = 4; @@ -32163,7 +33487,9 @@ /area/maintenance/department/chapel) "qte" = ( /obj/machinery/rnd/production/techfab/department/service, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -32186,6 +33512,14 @@ "qtI" = ( /turf/open/openspace, /area/bridge) +"qtY" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 + }, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "quq" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -32214,17 +33548,6 @@ }, /turf/open/floor/iron, /area/teleporter) -"quH" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "quQ" = ( /obj/machinery/door/poddoor/shutters{ id = "atmosshutters"; @@ -32275,6 +33598,13 @@ /obj/structure/lattice, /turf/open/openspace, /area/science/lab) +"qwe" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "qwi" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, @@ -32285,10 +33615,6 @@ /obj/structure/chair/office, /turf/open/floor/iron/dark, /area/engine/atmos) -"qwk" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/plating, -/area/maintenance/department/medical/central) "qwA" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -32367,13 +33693,6 @@ }, /turf/open/floor/pod/dark, /area/science/mixing) -"qxI" = ( -/obj/machinery/light{ - dir = 1 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/engine, -/area/science/explab) "qxQ" = ( /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -32420,16 +33739,6 @@ }, /turf/open/floor/pod/dark, /area/quartermaster/qm) -"qzg" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "qzj" = ( /obj/effect/turf_decal/siding/dark{ dir = 5 @@ -32438,17 +33747,6 @@ dir = 5 }, /turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) -"qzs" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/turf/open/openspace, /area/engineering/hallway{ name = "Engineering Viewing Platform" }) @@ -32497,10 +33795,6 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/iron, /area/engine/engineering) -"qBR" = ( -/obj/structure/lattice, -/turf/open/openspace, -/area/maintenance/department/security/brig) "qCg" = ( /turf/open/floor/plating/beach/deep_water, /area/asteroid/paradise/surface/water) @@ -32535,33 +33829,30 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) -"qDU" = ( -/obj/item/radio/intercom{ - pixel_x = 33; - pixel_y = -3 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, +"qEd" = ( /obj/effect/turf_decal/stripes/line{ - dir = 4 + dir = 10 }, +/obj/machinery/telecomms/processor/preset_four, +/turf/open/floor/circuit/telecomms/mainframe, +/area/tcommsat/server) +"qEQ" = ( +/obj/structure/chair, /obj/effect/turf_decal/stripes/line{ - dir = 8 + dir = 1 }, -/obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/light{ dir = 4 }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"qEd" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 32; + pixel_y = 3 }, -/obj/machinery/telecomms/processor/preset_four, -/turf/open/floor/circuit/telecomms/mainframe, -/area/tcommsat/server) +/turf/open/floor/iron/dark, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "qEU" = ( /obj/machinery/light{ dir = 8 @@ -32651,15 +33942,9 @@ /turf/open/floor/wood/broken, /area/vacant_room/office) "qId" = ( +/obj/structure/ladder, /obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "8-32" - }, -/obj/effect/turf_decal/trimline/yellow, -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, +/turf/open/floor/pod/dark, /area/maintenance/department/science/central) "qIX" = ( /obj/docking_port/stationary{ @@ -32711,26 +33996,12 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ name = "Connector Port (Air Supply)" }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /obj/machinery/atmospherics/pipe/simple/general/hidden/layer2{ dir = 6 }, /obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) -"qKB" = ( -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark/side{ - dir = 8 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "qKI" = ( /obj/machinery/portable_atmospherics/scrubber, /obj/effect/turf_decal/bot{ @@ -32759,14 +34030,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/science/central) -"qLj" = ( -/obj/structure/sign/departments/medbay/alt, -/turf/closed/wall/r_wall, -/area/crew_quarters/heads/cmo) -"qMa" = ( -/obj/effect/landmark/blobstart, -/turf/open/floor/plating, -/area/maintenance/department/medical/morgue) "qMA" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -32929,7 +34192,9 @@ /turf/open/floor/iron/dark, /area/engine/engineering) "qQU" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/machinery/sleeper{ dir = 8 @@ -33022,6 +34287,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) +"qTn" = ( +/obj/effect/turf_decal/tile/neutral{ + dir = 4 + }, +/turf/open/floor/iron/dark/corner{ + dir = 8 + }, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "qTU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted, /obj/structure/table/wood, @@ -33082,6 +34357,24 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron, /area/engine/atmos) +"qUt" = ( +/obj/structure/table/wood, +/obj/item/paper_bin{ + pixel_x = 4; + pixel_y = 3 + }, +/obj/item/pen{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom{ + pixel_y = 20 + }, +/turf/open/floor/iron, +/area/medical/surgery) "qUy" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/structure/disposalpipe/segment{ @@ -33094,6 +34387,10 @@ /obj/structure/closet/emcloset/anchored, /turf/open/floor/iron, /area/maintenance/department/science/central) +"qUD" = ( +/obj/structure/flora/ash/tall_shroom, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "qUJ" = ( /obj/machinery/clonepod/prefilled, /obj/effect/turf_decal/bot, @@ -33154,7 +34451,9 @@ /obj/item/radio/intercom{ pixel_y = 29 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -33279,34 +34578,13 @@ /obj/structure/railing/corner{ dir = 4 }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, +/obj/effect/turf_decal/siding/dark/corner, /turf/open/floor/iron/dark/side{ dir = 5 }, /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"qYy" = ( -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, -/obj/effect/landmark/start/chief_medical_officer, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) "qYC" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -33314,6 +34592,22 @@ /obj/machinery/digital_clock/directional/south, /turf/open/floor/iron, /area/security/brig) +"qYP" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/turf/open/floor/plating, +/area/quartermaster/warehouse) "qYU" = ( /obj/machinery/computer/bounty{ dir = 1 @@ -33324,20 +34618,17 @@ /obj/structure/flora/tree/jungle, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"qZq" = ( -/obj/machinery/light, -/obj/machinery/camera/autoname/directional/south{ - network = list("ss13","rd") - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on{ - dir = 4 - }, +"qZw" = ( +/obj/machinery/power/solar_control, /obj/structure/cable/yellow{ - icon_state = "0-8" + icon_state = "4-8" }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "qZA" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/turf_decal/bot, @@ -33412,12 +34703,6 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) -"rbv" = ( -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/engineering) "rbL" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/sand/plating, @@ -33437,7 +34722,13 @@ }, /area/asteroid/paradise/surface) "rca" = ( -/obj/structure/ladder, +/obj/structure/lattice/catwalk/over, +/obj/effect/turf_decal/trimline/yellow, +/obj/structure/cable/yellow{ + icon_state = "8-32" + }, +/obj/structure/closet, +/obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/plating, /area/maintenance/department/science/central) "rck" = ( @@ -33447,6 +34738,13 @@ }, /turf/open/floor/iron, /area/security/brig) +"rcr" = ( +/obj/structure/sign/departments/minsky/supply/hydroponics{ + pixel_x = -33 + }, +/obj/effect/turf_decal/tile/dark_green, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "rcE" = ( /obj/structure/lattice/catwalk/over, /obj/machinery/modular_computer/console/preset/engineering{ @@ -33545,6 +34843,23 @@ }, /turf/open/floor/iron, /area/security/brig) +"rfL" = ( +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 4 + }, +/obj/machinery/computer/security, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/iron, +/area/bridge) +"rfT" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "rgj" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -33559,14 +34874,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/engine/atmos) -"rgr" = ( -/obj/effect/turf_decal/delivery, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/plating, -/area/maintenance/department/eva) "rgA" = ( /obj/structure/ladder, /turf/open/floor/pod/dark, @@ -33609,7 +34916,9 @@ pixel_x = -3; pixel_y = 5 }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -33651,6 +34960,15 @@ }, /turf/open/floor/iron/white, /area/crew_quarters/fitness/recreation) +"riG" = ( +/obj/structure/railing, +/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, +/obj/effect/turf_decal/siding/white, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/turf/open/floor/iron/white, +/area/science/lab) "riT" = ( /obj/machinery/button/door{ id = "meetingshutter"; @@ -33677,32 +34995,16 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"rjh" = ( -/obj/structure/table, -/obj/machinery/cell_charger, -/obj/item/stock_parts/cell/high, -/obj/item/stock_parts/cell/high, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +"rjf" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) -"rjj" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 + icon_state = "4-8" }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/turf/open/floor/plating, +/area/maintenance/department/crew_quarters/bar) +"rjx" = ( +/obj/structure/fence, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "rjD" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33743,18 +35045,6 @@ }, /turf/open/floor/plating, /area/security/execution/education) -"rko" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ - dir = 8; - initialize_directions = 8 - }, -/turf/open/floor/iron, -/area/engine/engineering) "rkq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -33778,27 +35068,6 @@ /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/airless, /area/science/mixing) -"rkz" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 5 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"rkF" = ( -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "rkK" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -33842,6 +35111,15 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/pod/dark, /area/maintenance/department/engine) +"rlo" = ( +/obj/structure/window/reinforced/spawner/north, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/simple/general/visible, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "rlr" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -33926,17 +35204,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"rnb" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "rno" = ( /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, @@ -33961,22 +35228,6 @@ }, /turf/open/floor/iron/dark, /area/security/nuke_storage) -"rof" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, -/obj/item/electronics/airlock, -/obj/item/electronics/airlock, -/obj/item/stack/cable_coil, -/obj/item/stack/cable_coil{ - pixel_x = 3; - pixel_y = -7 - }, -/obj/item/storage/box/lights/mixed{ - pixel_x = 4; - pixel_y = 6 - }, -/turf/open/floor/iron, -/area/engine/engineering) "roj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -34005,12 +35256,6 @@ }, /turf/open/floor/iron/dark, /area/bridge/meeting_room) -"rpz" = ( -/obj/structure/railing{ - dir = 8 - }, -/turf/open/openspace, -/area/crew_quarters/heads/cmo) "rpC" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -34064,6 +35309,15 @@ }, /turf/open/openspace, /area/hydroponics) +"rpV" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "rqj" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/flora/ausbushes/sparsegrass, @@ -34072,25 +35326,20 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) -"rql" = ( -/obj/structure/railing/corner{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "rqo" = ( /obj/effect/turf_decal/siding/wideplating/terracotta/corner{ dir = 4 }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface/grass) +"rqt" = ( +/obj/machinery/door/window/northleft{ + dir = 2 + }, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "rqF" = ( /turf/closed/wall/r_wall, /area/tcommsat/server) @@ -34120,6 +35369,24 @@ /obj/effect/spawner/room/fivexthree, /turf/open/floor/plating, /area/maintenance/department/science/central) +"rrt" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/orange/hidden{ + dir = 10 + }, +/turf/open/floor/iron, +/area/engine/engineering) "rru" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -34142,20 +35409,6 @@ /obj/structure/sign/departments/minsky/security/security, /turf/closed/wall/r_wall, /area/security/brig) -"rrS" = ( -/obj/machinery/door/window/northleft{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "rsb" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -34175,6 +35428,15 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"rsf" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "rsH" = ( /obj/effect/turf_decal/numbers{ dir = 1 @@ -34312,6 +35574,22 @@ /obj/structure/reagent_dispensers/watertank, /turf/open/floor/plating, /area/maintenance/department/science/central) +"rvq" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "rvJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -34362,6 +35640,20 @@ "rxi" = ( /turf/open/floor/plating/dirt/planetary, /area/asteroid/paradise/surface) +"rxA" = ( +/obj/structure/table, +/obj/item/shovel/spade, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ + pixel_x = 5 + }, +/obj/item/reagent_containers/glass/bottle/nutrient/ez{ + pixel_x = -5 + }, +/obj/item/reagent_containers/syringe, +/obj/effect/decal/cleanable/dirt, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "rxI" = ( /obj/structure/railing, /obj/structure/lattice, @@ -34387,13 +35679,10 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) -"ryh" = ( -/obj/structure/lattice/catwalk/over, -/obj/machinery/firealarm/directional/north, -/turf/open/openspace, -/area/maintenance/department/security/brig) "ryA" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/machinery/vending/wardrobe/jani_wardrobe, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/tile/purple/anticorner/contrasted, @@ -34485,6 +35774,13 @@ }, /turf/open/floor/iron, /area/medical/surgery) +"rAu" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "rAS" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/purple/fourcorners/contrasted, @@ -34541,6 +35837,10 @@ dir = 4 }, /obj/effect/landmark/start/chemist, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/medical/apothecary) "rDD" = ( @@ -34742,12 +36042,12 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, /obj/effect/turf_decal/numbers/two_nine{ dir = 1 }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /turf/open/floor/iron, /area/maintenance/department/chapel) "rHQ" = ( @@ -34756,13 +36056,6 @@ /area/maintenance/department/bridge) "rId" = ( /turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) -"rIe" = ( -/obj/structure/railing, -/obj/structure/lattice/catwalk/over, -/turf/open/openspace, /area/hallway/primary/central{ name = "-2 Primary Hallway" }) @@ -34804,30 +36097,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2, /turf/open/floor/iron, /area/science/robotics) -"rJG" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/turf/open/floor/iron/white, -/area/medical/medbay/central) "rJO" = ( /obj/structure/chair/office{ dir = 1 @@ -34868,17 +36137,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/quartermaster/warehouse) -"rKr" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "rKN" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 @@ -34891,16 +36149,6 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"rKV" = ( -/obj/docking_port/stationary{ - dwidth = 12; - height = 69; - id = "whiteship_home"; - name = "Auxiliary Dock"; - width = 25 - }, -/turf/open/floor/plating/dirt/planetary, -/area/asteroid/paradise/surface/grass) "rLa" = ( /obj/structure/stairs, /obj/structure/extinguisher_cabinet{ @@ -35035,15 +36283,6 @@ dir = 1 }, /area/asteroid/paradise/surface) -"rPj" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/structure/chair/fancy/plastic{ - dir = 8 - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "rPo" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, @@ -35073,14 +36312,6 @@ "rPT" = ( /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"rQd" = ( -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "rQE" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -35118,6 +36349,11 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"rRm" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "rRx" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -35160,15 +36396,6 @@ }, /turf/open/openspace, /area/security/brig) -"rSl" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/machinery/vending/coffee, -/obj/effect/turf_decal/bot, -/turf/open/floor/iron, -/area/security/brig) "rSr" = ( /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) @@ -35196,6 +36423,20 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) +"rTr" = ( +/obj/structure/chair/fancy/comfy{ + color = "#596479" + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 1 + }, +/obj/effect/landmark/start/captain, +/obj/machinery/light{ + dir = 1 + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/blue, +/area/bridge/meeting_room) "rUl" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -35379,6 +36620,29 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/engine/engineering) +"rZs" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/door/airlock/command{ + name = "Chief Medical Officer's Office"; + req_access_txt = "40" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "rZv" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -35461,6 +36725,15 @@ }, /turf/open/floor/iron/dark, /area/gateway) +"saH" = ( +/obj/effect/turf_decal/caution/stand_clear, +/obj/machinery/door/poddoor/preopen{ + id = "meetingshutter"; + name = "Council Blast Doors" + }, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/iron/dark, +/area/bridge/meeting_room) "saM" = ( /turf/closed/wall, /area/maintenance/department/science/xenobiology) @@ -35513,12 +36786,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"scb" = ( -/obj/machinery/atmospherics/pipe/simple/green/visible{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "scw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -35567,12 +36834,6 @@ "sdD" = ( /turf/closed/wall/r_wall/rust, /area/science/test_area) -"sdG" = ( -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "sdK" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -35637,6 +36898,35 @@ /area/engineering/hallway{ name = "Engineering Viewing Platform" }) +"seY" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/table, +/obj/item/stack/sheet/rglass{ + amount = 30; + pixel_x = 2; + pixel_y = -2 + }, +/obj/item/stack/sheet/plasteel/fifty, +/obj/item/circuitboard/machine/shuttle/engine/plasma{ + pixel_y = 3 + }, +/obj/item/circuitboard/machine/shuttle/engine/plasma{ + pixel_x = -6 + }, +/obj/item/shuttle_creator{ + pixel_x = -2; + pixel_y = 4 + }, +/obj/item/circuitboard/machine/exploration_equipment_vendor{ + pixel_y = 5 + }, +/obj/item/circuitboard/machine/shuttle/heater, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "sff" = ( /obj/structure/rack, /obj/item/crowbar/red, @@ -35687,16 +36977,9 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"sgc" = ( -/obj/effect/turf_decal/box, -/obj/machinery/holopad, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) +"sfR" = ( +/turf/closed/wall/r_wall/rust, +/area/maintenance/department/cargo) "sgv" = ( /obj/effect/turf_decal/siding/white{ alpha = 100; @@ -35704,6 +36987,14 @@ }, /turf/open/indestructible/sound/pool, /area/crew_quarters/fitness/recreation) +"sho" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/maintenance/department/chapel) "shD" = ( /obj/structure/lattice/catwalk/over, /turf/open/floor/plating, @@ -35723,15 +37014,6 @@ }, /turf/open/floor/carpet/red, /area/security/detectives_office) -"shJ" = ( -/obj/machinery/button/door{ - id = "commissaryshutters1"; - name = "Commissary Shutters Control #1"; - pixel_x = -32; - pixel_y = -32 - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "sip" = ( /obj/machinery/camera/autoname/directional/west{ network = list("ss13","public") @@ -35789,22 +37071,6 @@ }, /turf/open/floor/iron/dark, /area/chapel/main) -"siX" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/light, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - alpha = 180; - dir = 8 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "sjC" = ( /obj/item/book/granter/spell/smoke/lesser{ pixel_x = -4; @@ -35825,6 +37091,19 @@ }, /turf/open/floor/wood, /area/chapel/office) +"sjD" = ( +/obj/structure/table/reinforced, +/obj/item/pipe_dispenser, +/obj/item/lightreplacer{ + pixel_x = 2; + pixel_y = 13 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = 25 + }, +/obj/structure/window/plasma/reinforced, +/turf/open/floor/iron, +/area/engine/engineering) "sjJ" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/suit/tan, @@ -35912,6 +37191,10 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"slT" = ( +/obj/machinery/vending/cigarette, +/turf/open/floor/iron, +/area/medical/surgery) "slY" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -35965,6 +37248,16 @@ }, /turf/open/floor/iron/dark, /area/chapel/office) +"sna" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "snu" = ( /turf/closed/wall, /area/crew_quarters/cryopods) @@ -35972,6 +37265,16 @@ /obj/structure/girder, /turf/open/floor/plating, /area/maintenance/department/cargo) +"sol" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/cable{ + icon_state = "0-2" + }, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "som" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ @@ -35981,19 +37284,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"soz" = ( -/obj/machinery/requests_console{ - department = "Cargo Bay"; - departmentType = 2; - pixel_y = 29 - }, -/obj/machinery/computer/cargo, -/obj/effect/turf_decal/stripes/line, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/quartermaster/storage) "soL" = ( /obj/machinery/porta_turret/ai{ dir = 4 @@ -36054,6 +37344,19 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"sqh" = ( +/obj/machinery/light/small/broken/directional/west, +/obj/structure/frame, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) +"sqm" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, +/obj/effect/turf_decal/sand/plating, +/obj/structure/grille, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "sru" = ( /obj/structure/chair/wood/normal{ dir = 8 @@ -36092,10 +37395,37 @@ /obj/item/paicard, /turf/open/floor/iron, /area/maintenance/department/medical/central) +"ssu" = ( +/obj/effect/turf_decal/box/white, +/obj/machinery/rnd/server, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 + }, +/turf/open/floor/circuit/telecomms/server, +/area/science/server) "ssw" = ( /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron/tech, /area/engine/atmos) +"ssy" = ( +/obj/structure/safe, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c1000, +/obj/item/stack/spacecash/c500, +/obj/item/stack/spacecash/c500, +/obj/item/ammo_box/a357, +/obj/item/gun/ballistic/automatic/pistol/deagle, +/obj/item/gun/ballistic/revolver/russian, +/obj/structure/sign/warning/securearea{ + pixel_y = -32 + }, +/turf/open/floor/circuit/green{ + luminosity = 2 + }, +/area/security/nuke_storage) "ssT" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -36104,9 +37434,23 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating, /area/quartermaster/storage) -"stJ" = ( -/turf/open/openspace, -/area/crew_quarters/heads/cmo) +"stR" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/chair/fancy/plastic, +/turf/open/floor/iron, +/area/maintenance/department/chapel) +"stZ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "chemistry_shutters"; + name = "chemistry shutters" + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/medical/apothecary) "sua" = ( /obj/structure/chair/office{ dir = 8 @@ -36134,21 +37478,19 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"suk" = ( -/obj/structure/chair/office/light{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/opposingcorners{ - dir = 1 +"suJ" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/directional/north{ + network = list("ss13","medbay") }, -/obj/structure/cable/yellow{ - icon_state = "1-2" +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 6 }, -/obj/structure/disposalpipe/segment{ - dir = 2 +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 6 }, -/turf/open/floor/iron/white, -/area/crew_quarters/heads/cmo) +/turf/open/floor/iron, +/area/medical/surgery) "suO" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -36161,18 +37503,6 @@ }, /turf/open/lava/smooth, /area/asteroid/paradise) -"svO" = ( -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/medical/medbay/central) "swh" = ( /obj/machinery/smartfridge/food, /turf/closed/wall, @@ -36203,6 +37533,10 @@ /obj/structure/reagent_dispensers/fueltank, /turf/open/floor/iron, /area/maintenance/department/science/xenobiology) +"swK" = ( +/obj/structure/railing, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) "swO" = ( /obj/machinery/door/firedoor, /obj/effect/mapping_helpers/airlock/cyclelink_helper{ @@ -36249,18 +37583,21 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"swV" = ( -/obj/structure/chair{ - dir = 4 - }, -/turf/open/floor/iron, -/area/science/mixing) "sxu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance/two, /turf/open/floor/iron/sepia, /area/quartermaster/warehouse) +"sxA" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "sxD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -36305,6 +37642,19 @@ }, /turf/open/floor/iron, /area/storage/primary) +"szu" = ( +/mob/living/simple_animal/pet/dog/corgi/Ian{ + density = 0; + dir = 1; + pixel_y = 4 + }, +/obj/item/toy/plush/ian, +/obj/structure/bed/dogbed/ian, +/obj/item/storage/secure/safe{ + pixel_x = 38 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "sAm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -36348,6 +37698,16 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/maintenance/department/eva) +"sBO" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/turf/open/floor/iron/dark, +/area/engine/engineering) "sBX" = ( /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/planetary, @@ -36501,6 +37861,18 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"sGP" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/sign/painting/library{ + pixel_x = 1; + pixel_y = -32 + }, +/turf/open/floor/iron, +/area/medical/surgery) "sGX" = ( /obj/item/kirbyplants/random, /turf/open/floor/iron/sepia, @@ -36526,8 +37898,12 @@ "sHD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/spawner/lootdrop/glowstick/lit, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/maintenance/department/chapel) +"sHG" = ( +/obj/machinery/light/small/broken/directional/east, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "sHI" = ( /obj/effect/turf_decal/delivery, /obj/effect/decal/cleanable/dirt/dust, @@ -36598,26 +37974,6 @@ }, /turf/open/floor/iron/dark, /area/medical/morgue) -"sKx" = ( -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/machinery/atmospherics/components/binary/pump/on/layer4{ - dir = 8; - name = "Waste to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/on/layer2{ - dir = 4; - name = "Air to Distro"; - target_pressure = 500 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "sKD" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/space_heater, @@ -36638,6 +37994,13 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"sLe" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "sLz" = ( /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) @@ -36770,9 +38133,8 @@ name = "-3 Primary Hallway" }) "sNy" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/structure/railing{ - dir = 8 +/obj/structure/railing/corner{ + dir = 1 }, /turf/open/floor/plating, /area/maintenance/department/chapel) @@ -36789,6 +38151,12 @@ }, /turf/open/floor/pod/dark, /area/maintenance/department/engine/atmos) +"sOB" = ( +/obj/structure/railing{ + dir = 10 + }, +/turf/open/floor/glass/reinforced, +/area/crew_quarters/heads/cmo) "sPu" = ( /obj/structure/railing{ dir = 8 @@ -36802,14 +38170,31 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron, /area/engine/atmos) -"sPG" = ( -/obj/structure/lattice, -/obj/machinery/light{ - dir = 8 +"sPK" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 }, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"sQq" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" }) "sQU" = ( /obj/effect/decal/cleanable/dirt, @@ -36860,16 +38245,6 @@ "sSJ" = ( /turf/closed/wall, /area/chapel/main) -"sSN" = ( -/obj/structure/chair{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "sTa" = ( /obj/effect/turf_decal/siding/wood, /obj/item/hatchet, @@ -36920,16 +38295,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"sUg" = ( -/obj/machinery/airalarm/engine{ - dir = 8; - pixel_x = -23 - }, -/obj/machinery/meter, -/obj/machinery/light/small, -/obj/machinery/atmospherics/pipe/simple/green/visible, -/turf/open/floor/engine, -/area/engine/supermatter) "sUh" = ( /obj/machinery/computer/card/minor/hos, /obj/structure/cable/yellow{ @@ -36940,14 +38305,6 @@ }, /turf/open/floor/iron/dark, /area/crew_quarters/heads/hos) -"sUS" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/directional/north{ - network = list("ss13","medbay") - }, -/obj/machinery/vending/cigarette, -/turf/open/floor/iron, -/area/medical/surgery) "sUW" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, @@ -37083,17 +38440,13 @@ /obj/structure/flora/ausbushes/lavendergrass, /turf/open/floor/plating/asteroid/basalt/planetary, /area/asteroid/paradise) -"sXp" = ( -/obj/machinery/airalarm/directional/east, -/mob/living/simple_animal/pet/dog/corgi/Ian{ - density = 0; - dir = 1; - pixel_y = 4 +"sXm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" }, -/obj/item/toy/plush/ian, -/obj/structure/bed/dogbed/ian, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/hop) +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "sXB" = ( /turf/closed/wall/r_wall, /area/engine/engineering) @@ -37227,6 +38580,22 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) +"tai" = ( +/obj/structure/lattice/catwalk/over, +/obj/item/wirecutters{ + pixel_x = -6; + pixel_y = -12 + }, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "tay" = ( /obj/machinery/disposal/bin, /obj/effect/turf_decal/bot, @@ -37265,12 +38634,14 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) -"taZ" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/plating/asteroid/planetary, -/area/asteroid/paradise) +"taT" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/medical/surgery) "tbm" = ( /obj/machinery/light{ dir = 8 @@ -37320,6 +38691,21 @@ /obj/effect/turf_decal/evac/evac_big, /turf/open/floor/iron, /area/maintenance/department/science/central) +"tcS" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "tdh" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37359,6 +38745,19 @@ }, /turf/open/floor/iron, /area/bridge) +"tel" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) +"teo" = ( +/obj/effect/turf_decal/siding/blue{ + dir = 5 + }, +/turf/open/floor/glass/reinforced, +/area/medical/medbay/central) "teA" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -37375,22 +38774,6 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal/incinerator) -"teC" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "teE" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -37439,6 +38822,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/prison, /area/security/prison) "tfh" = ( @@ -37497,31 +38883,6 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/tech, /area/engine/engineering) -"tfQ" = ( -/obj/machinery/atmospherics/components/binary/pump/layer4{ - dir = 4; - name = "Port to Filter" - }, -/obj/machinery/atmospherics/components/binary/pump/layer2{ - dir = 8; - name = "Air to Ports" - }, -/obj/machinery/atmospherics/pipe/simple/general/visible{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/tech, -/area/engine/atmos) -"tfX" = ( -/obj/structure/railing, -/turf/open/floor/iron/dark, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "tgg" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -37538,6 +38899,12 @@ /obj/effect/turf_decal/trimline/dark_blue/filled/corner, /turf/open/floor/iron/dark, /area/bridge/meeting_room) +"tgt" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/sand/plating, +/obj/structure/chair/fancy/plastic, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "tgH" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -37567,20 +38934,6 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/carpet/royalblue, /area/crew_quarters/heads/captain) -"thg" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/chair{ - dir = 1 - }, -/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/light/small, -/turf/open/floor/iron, -/area/medical/medbay/central) "thm" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -37596,13 +38949,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/eva) -"thD" = ( -/obj/effect/turf_decal/box/white, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "thO" = ( /obj/structure/table, /obj/machinery/plantgenes{ @@ -37723,22 +39069,6 @@ }, /turf/open/floor/iron, /area/security/brig) -"tjN" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/medical/medbay/central) "tko" = ( /turf/closed/wall, /area/security/detectives_office) @@ -37804,13 +39134,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"tkJ" = ( -/turf/open/floor/iron/dark/side{ - dir = 6 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "tkW" = ( /obj/machinery/flasher{ id = "AI"; @@ -37976,23 +39299,6 @@ /obj/structure/window/reinforced, /turf/open/floor/grass/no_border, /area/medical/storage) -"tnI" = ( -/obj/structure/chair/fancy/comfy{ - color = "#596479" - }, -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 1 - }, -/obj/effect/landmark/start/captain, -/obj/machinery/light{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_x = 1; - pixel_y = 27 - }, -/turf/open/floor/carpet/blue, -/area/bridge/meeting_room) "tnQ" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/purple/visible, @@ -38035,6 +39341,20 @@ "tov" = ( /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"tox" = ( +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "cmoshutter"; + name = "CMO Office Shutters" + }, +/turf/open/floor/plating, +/area/crew_quarters/heads/cmo) "toz" = ( /turf/closed/wall/rust, /area/science/test_area) @@ -38085,31 +39405,28 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/science/central) -"tpN" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, +"tqj" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/flora/rock/pile, /obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/structure/disposalpipe/segment{ - dir = 8 + icon_state = "4-8" }, -/turf/open/floor/iron/grid/steel, -/area/medical/patients_rooms) -"tqc" = ( -/obj/machinery/airalarm/directional/south, -/turf/open/floor/plating, -/area/medical/surgery) +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "tqq" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/atmos/mix_input{ dir = 1 }, /turf/open/floor/engine/airless, /area/engine/atmos) +"tqs" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/digital_clock/directional/north, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "tqL" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -38118,26 +39435,20 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) -"tqM" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/open/floor/iron/dark/side{ - dir = 9 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "tqW" = ( /obj/effect/turf_decal/tile/blue/half{ dir = 8 }, /turf/open/floor/iron/white, /area/medical/medbay/central) +"trc" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "trd" = ( /turf/closed/wall/mineral/titanium/survival, /area/hallway/primary/fore{ @@ -38172,16 +39483,33 @@ icon_state = "baseball_bat_metal"; name = "kneecapper" }, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /turf/open/floor/iron/dark, /area/security/execution/education) +"trI" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/evac/evac_big{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/science/xenobiology) "tsf" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -38300,6 +39628,9 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/engine/engineering) +"ttw" = ( +/turf/closed/wall/r_wall, +/area/quartermaster/storage) "ttC" = ( /obj/structure/railing, /obj/structure/lattice, @@ -38323,12 +39654,28 @@ }, /turf/open/floor/iron, /area/maintenance/department/science/central) +"ttG" = ( +/obj/structure/railing{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "ttY" = ( /turf/closed/wall, /area/medical/medbay/central) "tuo" = ( /obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -38366,6 +39713,12 @@ /obj/machinery/atmospherics/pipe/simple/green/hidden, /turf/open/floor/engine/plasma, /area/engine/atmos) +"tvj" = ( +/obj/structure/fence/cut/medium{ + dir = 8 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "tvm" = ( /obj/item/beacon{ pixel_y = 3 @@ -38386,6 +39739,30 @@ /obj/structure/flora/rock/pile, /turf/open/floor/plating/asteroid/basalt/planetary, /area/science/misc_lab) +"twg" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/sign/warning/nosmoking{ + pixel_x = -32 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) +"two" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/green/visible{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "tww" = ( /obj/machinery/light{ dir = 8 @@ -38407,18 +39784,6 @@ /obj/effect/turf_decal/stripes/closeup, /turf/open/floor/plating, /area/maintenance/department/science/xenobiology) -"twG" = ( -/obj/structure/window/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/turf/open/floor/iron/grid/steel, -/area/bridge) "twK" = ( /obj/structure/table/reinforced, /obj/effect/spawner/lootdrop/aimodule_harmful, @@ -38475,6 +39840,29 @@ "tyz" = ( /turf/open/floor/engine, /area/science/explab) +"tyF" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/structure/table/glass, +/obj/item/folder/blue, +/obj/item/flashlight/pen, +/obj/item/clothing/neck/stethoscope, +/obj/item/computer_hardware/hard_drive/role/medical{ + pixel_x = 3 + }, +/obj/item/computer_hardware/hard_drive/role/medical{ + pixel_x = -3 + }, +/obj/item/computer_hardware/hard_drive/role/chemistry{ + pixel_y = 6 + }, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) "tyI" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -38483,20 +39871,6 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron, /area/maintenance/department/science/central) -"tzm" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 6 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/dark/corner{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "tzq" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, @@ -38541,31 +39915,6 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"tAz" = ( -/obj/structure/railing{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 - }, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "tAG" = ( /obj/machinery/door/airlock/hatch{ name = "MiniSat Teleporter"; @@ -38582,15 +39931,6 @@ }, /turf/open/floor/iron/tech/grid, /area/ai_monitored/turret_protected/aisat/foyer) -"tAK" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/structure/lattice, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "tAS" = ( /obj/structure/table, /obj/item/paper_bin{ @@ -38624,13 +39964,6 @@ }, /turf/open/floor/iron, /area/engine/atmos) -"tBj" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "tBk" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/barricade/wooden, @@ -38696,7 +40029,9 @@ /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -38711,6 +40046,17 @@ }, /turf/open/floor/iron/white/side, /area/science/research) +"tCQ" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/plating, +/area/medical/apothecary) "tDp" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -38752,6 +40098,19 @@ }, /turf/open/floor/iron/grid/steel, /area/hydroponics) +"tDZ" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "tEl" = ( /obj/machinery/door/airlock/science{ name = "Toxins Lab"; @@ -38977,6 +40336,17 @@ }, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"tIU" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/structure/reagent_dispensers/water_cooler, +/turf/open/floor/iron/dark/side{ + dir = 9 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "tJa" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible/layer4{ dir = 4 @@ -39066,6 +40436,15 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) +"tKv" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) "tKR" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/stripes/line{ @@ -39122,6 +40501,10 @@ /obj/machinery/telecomms/server/presets/engineering, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) +"tMK" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/mineral/plastitanium, +/area/asteroid/paradise/surface) "tNh" = ( /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, @@ -39186,6 +40569,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/maintenance/department/medical/central) +"tOu" = ( +/obj/effect/decal/cleanable/dirt, +/turf/closed/wall/r_wall/rust, +/area/asteroid/paradise) "tOv" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -39247,6 +40634,10 @@ /obj/machinery/chem_dispenser{ layer = 2.7 }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron, /area/medical/apothecary) "tPg" = ( @@ -39451,12 +40842,6 @@ }, /turf/open/floor/iron, /area/engine/engineering) -"tRZ" = ( -/obj/structure/sign/poster/official/moth8{ - pixel_y = 31 - }, -/turf/open/openspace, -/area/crew_quarters/heads/cmo) "tSb" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 1 @@ -39490,19 +40875,10 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark, /area/chapel/office) -"tSB" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 - }, -/obj/structure/cable{ - icon_state = "0-4" - }, -/obj/machinery/power/rad_collector/anchored, -/turf/open/floor/plating, -/area/engine/supermatter) +"tSC" = ( +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "tSN" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -39577,15 +40953,6 @@ }, /turf/open/floor/iron/dark, /area/security/warden) -"tTn" = ( -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - alpha = 180 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "tTt" = ( /obj/effect/turf_decal/tile/neutral{ dir = 4 @@ -39606,7 +40973,7 @@ /obj/structure/cable/yellow{ icon_state = "2-8" }, -/turf/open/floor/iron, +/turf/open/floor/plating, /area/maintenance/department/chapel) "tUh" = ( /obj/structure/cable{ @@ -39650,6 +41017,15 @@ }, /turf/open/floor/plating, /area/maintenance/department/science/central) +"tUx" = ( +/obj/item/radio/intercom{ + pixel_x = 1; + pixel_y = -30 + }, +/obj/machinery/portable_atmospherics/scrubber, +/obj/effect/turf_decal/box, +/turf/open/floor/iron/tech, +/area/engine/engineering) "tUA" = ( /obj/item/radio/intercom{ pixel_y = -35 @@ -39709,12 +41085,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/tech, /area/engine/engineering) -"tVu" = ( -/obj/effect/landmark/observer_start, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "tVy" = ( /obj/machinery/power/apc{ areastring = "/area/vacant_room/office"; @@ -39764,7 +41134,9 @@ pixel_x = 32; pixel_y = 31 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -39780,23 +41152,6 @@ "tVY" = ( /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"tWb" = ( -/obj/item/trash/popcorn, -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/medical/surgery) "tWu" = ( /obj/machinery/atmospherics/pipe/multiz/layer4{ dir = 1 @@ -39863,6 +41218,18 @@ }, /turf/open/floor/iron, /area/crew_quarters/dorms) +"tXw" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "tYc" = ( /obj/structure/sign/departments/restroom{ pixel_y = 32 @@ -39962,35 +41329,6 @@ }, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) -"udm" = ( -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/structure/cable/yellow{ - icon_state = "2-4" - }, -/obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/structure/cable/yellow{ - icon_state = "2-16" - }, -/obj/effect/turf_decal/trimline/yellow, -/obj/effect/landmark/start/station_engineer, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/dark/visible{ - dir = 1 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "udq" = ( /obj/structure/flora/junglebush/b, /obj/structure/window/reinforced{ @@ -40006,7 +41344,9 @@ dir = 1 }, /obj/machinery/light, -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -40025,10 +41365,24 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"uet" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/turf_decal/evac{ + dir = 1 + }, +/turf/open/floor/iron, +/area/maintenance/department/engine) "ueO" = ( /obj/machinery/smartfridge/chemistry/preloaded, /turf/closed/wall, /area/medical/apothecary) +"ueT" = ( +/obj/machinery/door/poddoor/shutters{ + id = "exploration" + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "ueV" = ( /turf/closed/wall, /area/quartermaster/qm) @@ -40085,43 +41439,12 @@ }, /turf/open/floor/iron, /area/science/mixing) -"ugw" = ( -/obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped{ - dir = 8; - piping_layer = 2; - node1_concentration = 0.21; - node2_concentration = 0.79 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 4 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/obj/structure/window/plasma/reinforced{ - dir = 1 - }, -/turf/open/floor/iron, -/area/engine/atmos) "ugW" = ( /turf/open/floor/plating/asteroid/planetary, /area/quartermaster/storage) "uhc" = ( /turf/closed/wall, /area/medical/surgery) -"uhf" = ( -/obj/structure/table, -/obj/item/book/manual/wiki/sopengineering, -/obj/item/clothing/glasses/meson{ - pixel_y = 1 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "uhk" = ( /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ @@ -40340,9 +41663,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 1 - }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) "uli" = ( @@ -40352,7 +41672,9 @@ /obj/machinery/light{ dir = 4 }, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/chair/office/light{ dir = 1; pixel_y = 3 @@ -40363,9 +41685,12 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/grid/steel, /area/science/xenobiology) -"uly" = ( -/turf/closed/wall, -/area/security/nuke_storage) +"ulq" = ( +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/iron, +/area/science/mixing) "uma" = ( /obj/structure/railing{ dir = 8 @@ -40384,8 +41709,22 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) +"unh" = ( +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/turf/open/floor/grass/no_border, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) "unj" = ( /obj/structure/closet/secure_closet/medical3, /obj/item/stack/sheet/iron/fifty{ @@ -40482,12 +41821,6 @@ }, /turf/open/floor/iron/dark, /area/security/brig) -"uoF" = ( -/obj/machinery/light/small{ - dir = 4 - }, -/turf/open/floor/plating, -/area/maintenance/department/chapel) "upo" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/camera/autoname/directional/west{ @@ -40497,27 +41830,6 @@ /obj/machinery/computer/libraryconsole/bookmanagement, /turf/open/floor/carpet/royalblack, /area/vacant_room/office) -"upw" = ( -/obj/structure/cable/yellow{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "upy" = ( /obj/machinery/door/airlock/engineering{ name = "Telecomms Storage"; @@ -40530,6 +41842,13 @@ }, /turf/open/floor/iron, /area/engine/atmos) +"upA" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "upK" = ( /obj/structure/window/reinforced{ dir = 8 @@ -40561,17 +41880,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"upV" = ( -/obj/structure/railing, -/obj/machinery/disposal/bin, -/obj/effect/turf_decal/bot, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "uqc" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -40580,20 +41888,6 @@ slowdown = 0 }, /area/asteroid/paradise/surface) -"uqn" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) "uqA" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -40624,17 +41918,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/engine) -"urc" = ( -/obj/structure/railing{ - dir = 9 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 9 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "urh" = ( /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 4 @@ -40672,15 +41955,6 @@ /obj/machinery/atmospherics/components/binary/pump/on, /turf/open/floor/engine, /area/maintenance/disposal/incinerator) -"urX" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/openspace, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "usq" = ( /obj/structure/lattice, /turf/open/openspace, @@ -40799,18 +42073,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/plating, /area/asteroid/paradise/surface) -"uwd" = ( -/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ - alpha = 180 - }, -/obj/machinery/light{ - dir = 1 - }, -/obj/machinery/computer/communications{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/bridge) "uwm" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -40862,22 +42124,20 @@ }, /turf/open/floor/wood, /area/crew_quarters/theatre/backstage) -"uxo" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt, -/obj/structure/flora/ausbushes/lavendergrass, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) "uxt" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) -"uxz" = ( -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/open/floor/plating/asteroid/basalt/planetary, -/area/asteroid/paradise) +"uxv" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/iron/dark, +/area/bridge) "uxB" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -40933,6 +42193,13 @@ }, /turf/open/floor/iron, /area/maintenance/department/eva) +"uyP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/curtain/directional{ + dir = 1 + }, +/turf/open/floor/plating, +/area/crew_quarters/theatre/backstage) "uAb" = ( /obj/machinery/atmospherics/components/trinary/filter/critical{ dir = 4; @@ -40971,6 +42238,22 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"uAS" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "uBk" = ( /obj/machinery/holopad, /obj/structure/railing/corner{ @@ -41214,6 +42497,13 @@ /obj/item/book/manual/wiki/sopservice, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) +"uJN" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "uJX" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -41306,6 +42596,18 @@ /obj/structure/closet/firecloset/full, /turf/open/floor/iron, /area/maintenance/department/cargo) +"uMh" = ( +/obj/structure/chair, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "uMJ" = ( /obj/machinery/computer/xenoartifact_console, /obj/effect/turf_decal/bot, @@ -41381,15 +42683,16 @@ }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/cryopods) -"uNV" = ( -/obj/structure/lattice/catwalk/over, -/obj/structure/railing{ - dir = 4 - }, -/obj/structure/closet/emcloset, -/turf/open/openspace, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" +"uOa" = ( +/turf/open/floor/glass/reinforced/plasma, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) +"uOf" = ( +/obj/effect/landmark/observer_start, +/turf/open/floor/glass/reinforced, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" }) "uOs" = ( /obj/machinery/atmospherics/pipe/simple/green/visible/layer4{ @@ -41467,6 +42770,20 @@ }, /turf/open/floor/prison, /area/security/prison) +"uQq" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/machinery/hydroponics/constructable, +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/item/paper/guides/jobs/hydroponics{ + default_raw_text = "
Hey there,
Sorry about the cramped space! � I know it's a bit tight in here.
But just so you know, I found a few more hydroponic trays stashed behind botany in maintenance. Feel free to grab them if you need!
Take care!
"; + pixel_x = 6 + }, +/turf/open/floor/iron/grid/steel, +/area/hydroponics) "uQu" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -41507,6 +42824,13 @@ /obj/structure/sign/warning/explosives/alt, /turf/open/floor/plating/dirt/jungle/wasteland, /area/asteroid/paradise/surface) +"uRt" = ( +/obj/machinery/door/airlock/maintenance_hatch{ + name = "Maintenance Hatch"; + req_access_txt = "12" + }, +/turf/open/floor/plating, +/area/maintenance/department/medical/morgue) "uRz" = ( /obj/effect/decal/cleanable/blood/old, /obj/structure/cable/yellow{ @@ -41563,21 +42887,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/asteroid/paradise/surface) -"uSM" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/turf/open/floor/iron/tech, -/area/engine/atmos) "uSN" = ( /obj/machinery/door/airlock/command{ id_tag = "teleshutter"; @@ -41604,26 +42913,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/teleporter) -"uSY" = ( -/obj/machinery/computer/operating{ - dir = 1 - }, -/obj/item/radio/intercom{ - pixel_y = -27 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/medical/surgery) -"uTj" = ( -/obj/structure/window/plasma/reinforced{ - dir = 8 - }, -/turf/open/openspace, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "uTt" = ( /obj/machinery/camera/autoname/directional/south{ network = list("ss13","medbay","public") @@ -41666,6 +42955,21 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/dark, /area/engine/engineering) +"uTY" = ( +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/item/kirbyplants/random, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 10 + }, +/obj/machinery/digital_clock/directional/east, +/turf/open/floor/iron, +/area/bridge) "uUf" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -41683,18 +42987,6 @@ }, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/maint) -"uUk" = ( -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 1 - }, -/obj/effect/turf_decal/evac, -/turf/open/floor/iron, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "uUz" = ( /obj/item/pool/rubber_ring, /obj/effect/turf_decal/siding/red{ @@ -41714,7 +43006,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-2" }, @@ -41735,6 +43029,20 @@ /obj/effect/turf_decal/tile/brown/half/contrasted, /turf/open/floor/iron/dark, /area/quartermaster/qm) +"uVq" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/obj/structure/cable{ + icon_state = "2-8" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "uVr" = ( /obj/machinery/space_heater, /turf/open/floor/plating, @@ -41743,7 +43051,9 @@ /turf/closed/wall, /area/hallway/secondary/service) "uVE" = ( -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -41774,16 +43084,15 @@ }, /turf/open/floor/pod/dark, /area/science/lab) -"uWl" = ( -/obj/effect/turf_decal/tile/red/half/contrasted{ - alpha = 180; - dir = 1 +"uWn" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" }, -/obj/structure/closet/firecloset/full, -/turf/open/floor/iron/dark/corner, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/effect/turf_decal/tile/dark_green/half/contrasted, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "uWx" = ( /obj/structure/chair/office{ dir = 4 @@ -41822,6 +43131,16 @@ }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) +"uXk" = ( +/obj/machinery/computer/security/mining, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/structure/window/reinforced{ + dir = 8 + }, +/turf/open/floor/iron, +/area/bridge) "uXm" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -41944,6 +43263,24 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"vat" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/turf/open/floor/iron/dark/side{ + dir = 4 + }, +/area/bridge) +"vaT" = ( +/obj/structure/table, +/obj/item/clothing/suit/apron/overalls, +/obj/item/cultivator, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "vba" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/cable/yellow{ @@ -42015,8 +43352,6 @@ /obj/structure/cable/yellow{ icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/iron/dark/side{ dir = 4 }, @@ -42024,14 +43359,11 @@ name = "-2 Primary Hallway" }) "vcX" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 8 +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 }, -/turf/open/floor/iron/dark/side{ - dir = 10 +/turf/open/floor/iron/dark/corner{ + dir = 1 }, /area/hallway/primary/central{ name = "-2 Primary Hallway" @@ -42076,17 +43408,6 @@ }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) -"vdB" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump{ - dir = 8; - name = "External Gas to Loop" - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/firealarm/directional/south, -/obj/machinery/light, -/turf/open/floor/iron/dark, -/area/engine/engineering) "vdC" = ( /obj/structure/railing/corner{ dir = 1 @@ -42247,6 +43568,20 @@ "vhU" = ( /turf/closed/wall/rust, /area/crew_quarters/fitness/recreation) +"vhX" = ( +/obj/structure/table, +/obj/item/seeds/flower/lily{ + pixel_x = 4; + pixel_y = 4 + }, +/obj/item/seeds/flower/geranium, +/obj/effect/decal/cleanable/dirt, +/obj/item/food/grown/wheat, +/obj/item/food/grown/corn, +/obj/item/food/grown/apple, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron, +/area/maintenance/department/medical/morgue) "vih" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -42354,6 +43689,15 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"vmm" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/sign/map/echo{ + pixel_x = -32 + }, +/turf/open/floor/iron, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "vmu" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -42366,13 +43710,6 @@ }, /turf/open/floor/carpet/green, /area/chapel/main) -"vmX" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/turf/open/floor/iron, -/area/engine/engineering) "vmY" = ( /obj/structure/closet/secure_closet/evidence, /obj/effect/turf_decal/bot, @@ -42454,6 +43791,25 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/cargo) +"vog" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 8 + }, +/obj/structure/table/reinforced, +/obj/machinery/computer/med_data/laptop{ + dir = 4; + pixel_x = 2; + pixel_y = 2 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "voA" = ( /obj/structure/lattice, /turf/open/openspace, @@ -42601,6 +43957,17 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/prison/dark, /area/security/prison) +"vsG" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/landmark/start/quartermaster, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "vsM" = ( /obj/structure/table/reinforced, /obj/item/storage/box/donkpockets{ @@ -42698,6 +44065,12 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"vuq" = ( +/obj/machinery/atmospherics/components/unary/plasma_refiner{ + dir = 8 + }, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "vuE" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 5 @@ -42716,6 +44089,19 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron, /area/engine/atmos) +"vuZ" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"vvg" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface/sand) "vvo" = ( /obj/structure/table, /obj/item/stock_parts/subspace/treatment, @@ -42743,17 +44129,22 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"vvA" = ( +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark, +/turf/open/floor/iron/dark, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "vvC" = ( /obj/structure/reagent_dispensers/watertank/high, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"vvK" = ( -/obj/effect/spawner/structure/window/plasma/reinforced, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 1 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "vwd" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/hos) @@ -42800,17 +44191,6 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/hop) -"vwI" = ( -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, -/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) "vwV" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/door/poddoor/shutters/preopen{ @@ -42827,6 +44207,14 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"vyh" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "vyl" = ( /obj/effect/landmark/start/medical_doctor, /turf/open/floor/iron/grid/steel, @@ -42872,6 +44260,9 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/carpet/orange, /area/quartermaster/qm) "vzo" = ( @@ -42900,10 +44291,16 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"vBh" = ( +/obj/machinery/power/tracker, +/obj/structure/cable, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "vBm" = ( /obj/machinery/door/airlock{ name = "Service Hall"; - req_one_access_txt = "12;22;25;26;28;35;37;38;46" + req_one_access_txt = "22;25;26;28;35;37;38;46" }, /obj/structure/cable/yellow{ icon_state = "4-8" @@ -42931,12 +44328,6 @@ /obj/effect/turf_decal/delivery/red, /turf/open/floor/iron/dark, /area/security/prison) -"vBZ" = ( -/obj/structure/railing/corner{ - dir = 8 - }, -/turf/open/openspace, -/area/medical/medbay/central) "vDt" = ( /obj/structure/flora/rock/pile, /obj/effect/decal/cleanable/dirt, @@ -43032,6 +44423,16 @@ }, /turf/open/floor/iron, /area/medical/apothecary) +"vFz" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "vFR" = ( /obj/structure/sign/warning/nosmoking/circle, /turf/closed/wall/r_wall, @@ -43056,6 +44457,51 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) +"vGc" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/tile/blue/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron/white, +/area/crew_quarters/heads/cmo) +"vGd" = ( +/obj/effect/turf_decal/stripes/line, +/obj/machinery/atmospherics/pipe/manifold/cyan/visible{ + dir = 1 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"vGz" = ( +/obj/machinery/atmospherics/pipe/simple/green/visible/layer2{ + dir = 10 + }, +/turf/closed/wall, +/area/engine/supermatter) +"vHd" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/stock_parts/micro_laser/ultra, +/obj/item/stock_parts/matter_bin/super, +/obj/item/stock_parts/matter_bin/super, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 4; + initialize_directions = 4 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "vHe" = ( /obj/effect/turf_decal/loading_area{ dir = 1; @@ -43156,6 +44602,15 @@ }, /turf/open/floor/iron/dark, /area/engine/engineering) +"vKW" = ( +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "vLx" = ( /obj/structure/sign/painting/library{ pixel_y = 1 @@ -43306,6 +44761,12 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"vRk" = ( +/obj/machinery/atmospherics/pipe/manifold/purple/visible{ + dir = 1 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "vRv" = ( /obj/structure/table/reinforced, /obj/item/paper/guides/recycler, @@ -43406,6 +44867,27 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/medical/morgue) +"vTn" = ( +/obj/structure/railing/corner{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"vTs" = ( +/obj/structure/railing/corner{ + dir = 4 + }, +/obj/structure/railing/corner, +/obj/structure/flora/ausbushes/lavendergrass, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "vTw" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -43439,17 +44921,6 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) -"vUe" = ( -/obj/machinery/portable_atmospherics/canister, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/components/unary/portables_connector/visible{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "vUl" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -43472,24 +44943,6 @@ }, /turf/open/floor/iron, /area/security/prison) -"vUQ" = ( -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ - dir = 1 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/atmos) "vVo" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -43588,12 +45041,6 @@ }, /turf/open/floor/iron, /area/janitor) -"vWm" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/flora/rock/pile, -/obj/machinery/digital_clock/directional/north, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "vWB" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/turf_decal/sand/plating, @@ -43656,20 +45103,17 @@ }, /turf/open/floor/carpet/blue, /area/crew_quarters/heads/cmo) -"vYB" = ( -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/item/kirbyplants/random, +"vYy" = ( /obj/structure/cable/yellow{ - icon_state = "2-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 10 + icon_state = "1-2" }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/effect/turf_decal/evac, /turf/open/floor/iron, -/area/bridge) +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "vZe" = ( /obj/effect/turf_decal/stripes/line, /obj/structure/fence/post{ @@ -43677,50 +45121,6 @@ }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) -"vZI" = ( -/obj/machinery/airalarm/all_access{ - dir = 4; - pixel_x = 24 - }, -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/table, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 7 - }, -/obj/item/pen{ - pixel_x = 5; - pixel_y = 8 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/camera/autoname/directional/east{ - network = list("ss13","engine") - }, -/obj/effect/loot_jobscale/medical/burn_kit{ - pixel_x = -6; - pixel_y = 10 - }, -/obj/item/storage/toolbox/emergency{ - pixel_x = 3; - pixel_y = -1 - }, -/obj/item/extinguisher/advanced{ - pixel_x = -8; - pixel_y = 2 - }, -/turf/open/floor/iron, -/area/maintenance/disposal/incinerator) "vZP" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -43757,8 +45157,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/effect/turf_decal/numbers{ - dir = 1 +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /turf/open/floor/iron, /area/maintenance/department/science/central) @@ -43831,7 +45231,9 @@ /obj/effect/turf_decal/siding/white{ dir = 8 }, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-4" }, @@ -43937,6 +45339,42 @@ }, /turf/open/floor/iron, /area/engine/engineering) +"wef" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/cyan/visible, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/simple/cyan/visible/layer2{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"wex" = ( +/obj/structure/lattice/catwalk/over, +/obj/structure/railing{ + dir = 4 + }, +/obj/structure/railing{ + dir = 8 + }, +/turf/open/openspace, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "wey" = ( /obj/structure/closet/cardboard, /obj/effect/spawner/lootdrop/maintenance/two, @@ -43990,6 +45428,21 @@ /obj/effect/turf_decal/bot, /turf/open/floor/iron/tech, /area/engine/atmos) +"wfD" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/machinery/light{ + dir = 1 + }, +/obj/machinery/computer/communications{ + dir = 4 + }, +/obj/machinery/status_display/evac{ + pixel_y = 32 + }, +/turf/open/floor/iron/dark, +/area/bridge) "wfF" = ( /obj/machinery/conveyor_switch/oneway{ dir = 8; @@ -44006,13 +45459,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/maintenance/disposal) -"wfP" = ( -/obj/effect/landmark/start/assistant, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron/showroomfloor, -/area/crew_quarters/fitness/recreation) "wgg" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -44038,6 +45484,23 @@ /obj/structure/lattice/catwalk/over, /turf/open/openspace, /area/maintenance/department/bridge) +"wgA" = ( +/obj/machinery/camera/autoname/directional/south{ + network = list("ss13","engine") + }, +/obj/item/radio/intercom{ + pixel_x = 33; + pixel_y = -2 + }, +/obj/machinery/light_switch{ + pixel_x = 23 + }, +/obj/machinery/atmospherics/components/binary/pump{ + name = "Gas to Chamber" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/engine/supermatter) "wgL" = ( /obj/item/radio/intercom{ dir = 1; @@ -44073,6 +45536,17 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/plating/asteroid/planetary, /area/crew_quarters/dorms) +"whz" = ( +/obj/item/storage/pod{ + pixel_x = 5; + pixel_y = 32 + }, +/obj/structure/extinguisher_cabinet{ + pixel_x = -30 + }, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/iron, +/area/medical/surgery) "whD" = ( /obj/structure/destructible/cult/tome, /obj/item/book/codex_gigas, @@ -44108,6 +45582,18 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/plating, /area/quartermaster/warehouse) +"whU" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "wiC" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/tile/blue/half{ @@ -44189,23 +45675,14 @@ }, /turf/open/openspace, /area/engine/atmos) +"wjA" = ( +/obj/structure/girder, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "wjR" = ( -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ - dir = 1 - }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) -"wjS" = ( -/obj/effect/turf_decal/box/white, -/obj/machinery/atmospherics/components/unary/vent_pump/siphon/on{ - external_pressure_bound = 120; - name = "server vent" - }, -/obj/structure/cable/yellow{ - icon_state = "1-4" - }, -/turf/open/floor/circuit/telecomms/server, -/area/science/server) "wjY" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -44300,24 +45777,17 @@ /obj/item/storage/backpack/satchel/flat/treasure, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface/sand) -"wnk" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 +"wmC" = ( +/obj/item/trash/popcorn, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ dir = 4 }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 8 - }, /turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) +/area/medical/surgery) "wnT" = ( /turf/open/floor/dock/drydock, /area/quartermaster/storage) @@ -44325,6 +45795,9 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, +/obj/machinery/ai_slipper{ + uses = 10 + }, /turf/open/floor/iron/showroomfloor, /area/crew_quarters/fitness/recreation) "woI" = ( @@ -44345,21 +45818,12 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/maintenance/department/engine) -"wpu" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 2 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/cyan/visible{ - dir = 9 +"wpX" = ( +/obj/structure/fence/corner{ + dir = 1 }, -/turf/open/floor/iron/dark, -/area/engine/engineering) +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "wqd" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -44380,12 +45844,6 @@ }, /turf/open/floor/iron/sepia, /area/quartermaster/storage) -"wql" = ( -/obj/structure/railing, -/obj/effect/turf_decal/tile/purple/fourcorners/contrasted, -/obj/effect/turf_decal/siding/white, -/turf/open/floor/iron/white, -/area/science/lab) "wqz" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ alpha = 180; @@ -44397,6 +45855,13 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"wqB" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "wqF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -44487,6 +45952,13 @@ /obj/machinery/space_heater, /turf/open/floor/iron, /area/maintenance/department/engine/atmos) +"wte" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/sign/warning/securearea, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "wtw" = ( /obj/effect/turf_decal/caution/stand_clear{ dir = 1; @@ -44614,17 +46086,15 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/iron, /area/ai_monitored/turret_protected/aisat/maint) -"wxC" = ( -/obj/structure/closet/firecloset/full, -/obj/structure/railing{ - dir = 6 - }, -/turf/open/floor/iron/dark/side{ - dir = 6 +"wxQ" = ( +/obj/effect/turf_decal/siding/wood, +/obj/effect/spawner/randomvend/cola, +/obj/machinery/airalarm/directional/west, +/obj/structure/sign/map/echo{ + pixel_y = 32 }, -/area/hallway/primary/aft{ - name = "-3 Primary Hallway" - }) +/turf/open/floor/carpet/green, +/area/crew_quarters/cafeteria) "wyg" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/disposalpipe/junction{ @@ -44634,14 +46104,58 @@ dir = 8 }, /area/science/research) +"wyo" = ( +/turf/open/floor/glass/reinforced, +/area/asteroid/paradise/surface) "wys" = ( /turf/closed/wall, /area/crew_quarters/kitchen/coldroom) +"wyu" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8; + name = "HOP"; + sortType = 15 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/effect/turf_decal/numbers{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral{ + dir = 8 + }, +/turf/open/floor/iron/dark/corner{ + dir = 4 + }, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "wyw" = ( /obj/effect/turf_decal/sand/plating, /obj/structure/flora/grass/jungle, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise) +"wyz" = ( +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 9; + piping_layer = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "wyJ" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -44742,6 +46256,10 @@ }, /turf/open/floor/iron/dark, /area/security/execution/education) +"wAx" = ( +/obj/structure/flora/rock, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise) "wAN" = ( /obj/effect/turf_decal/tile/dark_green/fourcorners/contrasted, /obj/effect/turf_decal/siding/white/corner{ @@ -44756,13 +46274,6 @@ }, /turf/open/floor/iron, /area/hydroponics) -"wAY" = ( -/obj/effect/turf_decal/sand/plating, -/obj/effect/turf_decal/sand/plating, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/decal/cleanable/dirt/dust, -/turf/open/floor/iron/techmaint/planetary, -/area/asteroid/paradise/surface) "wBy" = ( /obj/effect/decal/cleanable/dirt, /turf/closed/mineral/random/air, @@ -44781,6 +46292,10 @@ }, /turf/open/floor/plating, /area/quartermaster/warehouse) +"wCh" = ( +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "wCp" = ( /obj/effect/turf_decal/tile/dark_red/fourcorners/contrasted{ alpha = 180; @@ -44794,7 +46309,9 @@ "wCG" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/power/apc/auto_name/directional/east{ + pixel_x = 24 + }, /obj/structure/cable/yellow, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -44831,6 +46348,15 @@ /obj/effect/landmark/start/station_engineer, /turf/open/floor/iron/tech, /area/engine/atmos) +"wDD" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "wDK" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -45019,6 +46545,25 @@ }, /turf/open/floor/iron/dark, /area/maintenance/disposal) +"wHv" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4; + piping_layer = 1 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/atmos) "wHw" = ( /obj/structure/stairs{ dir = 8 @@ -45072,6 +46617,20 @@ /obj/structure/cable/yellow, /turf/open/floor/plating, /area/storage/tech) +"wIO" = ( +/obj/structure/chair/fancy/bench/corporate{ + dir = 1 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/warning{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "wIQ" = ( /obj/structure/flora/ausbushes/leafybush, /obj/structure/flora/ausbushes/fullgrass, @@ -45126,6 +46685,13 @@ "wKO" = ( /turf/closed/wall/r_wall, /area/science/test_area) +"wLa" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/sign/warning/electricshock, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "wLe" = ( /turf/open/floor/engine/light, /area/holodeck/small) @@ -45212,6 +46778,9 @@ name = "isolation shutters" }, /obj/effect/turf_decal/stripes/closeup, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, /turf/open/floor/iron, /area/maintenance/department/crew_quarters/bar) "wMY" = ( @@ -45267,17 +46836,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/iron, /area/engine/engineering) -"wNO" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/visible/layer4{ - dir = 9 - }, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/tech, -/area/engine/engineering) "wNR" = ( /obj/structure/cable/yellow{ icon_state = "2-8" @@ -45294,14 +46852,6 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) -"wOh" = ( -/obj/effect/turf_decal/trimline/dark_blue/filled/line{ - dir = 4 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/photocopier, -/turf/open/floor/iron/dark, -/area/bridge/meeting_room) "wOF" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -45393,7 +46943,9 @@ /area/maintenance/department/science/central) "wQK" = ( /obj/machinery/space_heater, -/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, /obj/structure/cable/yellow{ icon_state = "0-8" }, @@ -45502,38 +47054,18 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"wTG" = ( -/obj/structure/cable{ - icon_state = "1-8" - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"wTI" = ( -/obj/machinery/atmospherics/pipe/manifold/green/visible{ - dir = 8 - }, -/obj/structure/cable{ - icon_state = "1-2" - }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/engine/engineering) "wUl" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/open/floor/iron/white, /area/medical/apothecary) +"wUU" = ( +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface/sand) "wVx" = ( /obj/structure/sign/departments/minsky/supply/janitorial{ pixel_y = 32 @@ -45606,6 +47138,19 @@ /obj/effect/spawner/lootdrop/grille_or_trash, /turf/open/floor/plating, /area/maintenance/department/science/central) +"wWL" = ( +/obj/effect/turf_decal/siding/dark/corner{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/corner, +/obj/effect/turf_decal/trimline/yellow/corner{ + dir = 8 + }, +/obj/effect/turf_decal/siding/yellow/corner, +/turf/open/floor/iron/dark, +/area/engineering/hallway{ + name = "Engineering Viewing Platform" + }) "wXo" = ( /obj/machinery/door/airlock/security/glass{ id_tag = "outerbrig"; @@ -45625,6 +47170,13 @@ /obj/machinery/power/emitter, /turf/open/floor/iron, /area/engine/engineering) +"wYG" = ( +/obj/effect/turf_decal/sand/plating, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "wYL" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -45731,6 +47283,16 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/asteroid/planetary, /area/asteroid/paradise/surface) +"xbj" = ( +/obj/structure/rack, +/obj/effect/spawner/lootdrop/maintenance, +/obj/item/wrench{ + pixel_x = -4; + pixel_y = 7 + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "xbu" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/delivery, @@ -45828,7 +47390,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 }, -/turf/open/floor/iron, +/obj/structure/grille/broken, +/turf/open/floor/plating, /area/maintenance/department/chapel) "xcv" = ( /obj/effect/turf_decal/stripes/line{ @@ -45895,7 +47458,11 @@ /obj/effect/turf_decal/siding/wideplating/terracotta{ dir = 8 }, -/obj/structure/signpost, +/obj/structure/no_effect_signpost{ + name = "Echo station"; + pixel_x = -4; + pixel_y = 3 + }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) "xfd" = ( @@ -45954,20 +47521,22 @@ }, /turf/open/floor/iron, /area/medical/medbay/central) +"xge" = ( +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 1 + }, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/medical/medbay/central) "xgv" = ( /turf/closed/mineral/random/air, /area/science/misc_lab) -"xgC" = ( -/obj/structure/railing{ - dir = 5 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "xgH" = ( /turf/closed/wall, /area/medical/storage) @@ -46007,25 +47576,6 @@ }, /turf/open/floor/prison/dark, /area/security/prison) -"xiv" = ( -/obj/structure/chair, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/machinery/light{ - dir = 4 - }, -/obj/item/radio/intercom{ - dir = 1; - pixel_x = 32; - pixel_y = 3 - }, -/turf/open/floor/iron/dark/side{ - dir = 5 - }, -/area/hallway/primary/fore{ - name = "-1 Primary Hallway" - }) "xiB" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /turf/open/floor/plating, @@ -46037,6 +47587,19 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/wood, /area/crew_quarters/cafeteria) +"xiD" = ( +/obj/structure/railing, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/bot, +/obj/structure/disposalpipe/trunk{ + dir = 1 + }, +/turf/open/floor/iron/dark/side{ + dir = 10 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "xiF" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -46070,20 +47633,6 @@ /obj/structure/railing/corner, /turf/open/floor/iron/dark, /area/science/robotics) -"xiW" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 10 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 4 - }, -/obj/effect/turf_decal/trimline/dark/corner{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "xiY" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt/dust, @@ -46189,7 +47738,9 @@ /turf/open/floor/iron/tech, /area/engine/atmos) "xlw" = ( -/obj/machinery/power/apc/auto_name/directional/south, +/obj/machinery/power/apc/auto_name/directional/south{ + pixel_y = -24 + }, /obj/structure/cable/yellow, /obj/structure/filingcabinet{ pixel_x = -8 @@ -46291,35 +47842,16 @@ }, /turf/open/floor/plating/rust, /area/science/test_area) +"xoi" = ( +/obj/effect/spawner/structure/window/depleteduranium, +/turf/open/floor/plating, +/area/asteroid/paradise) "xoR" = ( /obj/effect/turf_decal/siding/wood{ dir = 10 }, /turf/open/floor/carpet/red, /area/crew_quarters/theatre/backstage) -"xoS" = ( -/obj/structure/railing/corner, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/door/airlock/atmos/glass{ - req_access_txt = "11" - }, -/obj/machinery/door/firedoor, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 4 - }, -/turf/open/floor/iron/dark, -/area/engine/atmos) "xpn" = ( /obj/machinery/computer/turbine_computer{ dir = 1; @@ -46365,15 +47897,6 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) -"xpI" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/turf/open/floor/iron/white, -/area/medical/surgery) "xpJ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 6 @@ -46473,14 +47996,6 @@ }, /turf/open/floor/iron, /area/maintenance/department/chapel) -"xrZ" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark/side{ - dir = 4 - }, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "xsc" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -46522,6 +48037,32 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/medical/morgue) +"xsS" = ( +/obj/structure/railing/corner{ + dir = 1 + }, +/obj/effect/turf_decal/siding/dark/corner{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark/side{ + dir = 8 + }, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) +"xsU" = ( +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 2 + }, +/obj/effect/turf_decal/siding/wideplating/dark{ + dir = 9 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/cmo) "xtb" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -46593,6 +48134,17 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/science/lab) +"xvc" = ( +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/simple/orange/visible{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/engine/engineering) "xvi" = ( /obj/machinery/light/small{ dir = 4 @@ -46675,6 +48227,12 @@ /obj/machinery/light, /turf/open/floor/iron/dark, /area/teleporter) +"xwt" = ( +/obj/structure/fence/corner{ + dir = 8 + }, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "xwB" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -46733,12 +48291,39 @@ dir = 1 }, /area/asteroid/paradise/surface) +"xwR" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/green/visible, +/obj/machinery/atmospherics/pipe/manifold/green/visible/layer2{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/engine/engineering) +"xwU" = ( +/turf/open/floor/glass/reinforced, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "xxa" = ( /obj/effect/turf_decal/siding/wideplating/terracotta{ dir = 1 }, /turf/open/floor/plating/grass, /area/asteroid/paradise/surface) +"xxV" = ( +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/dark_blue{ + alpha = 180 + }, +/turf/open/floor/iron, +/area/hallway/primary/central{ + name = "-2 Primary Hallway" + }) "xyh" = ( /obj/effect/turf_decal/siding/wideplating/dark{ dir = 10 @@ -46771,6 +48356,33 @@ }, /turf/open/floor/iron, /area/hallway/secondary/service) +"xyV" = ( +/obj/effect/turf_decal/tile/dark_blue/fourcorners/contrasted{ + alpha = 180 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4{ + dir = 8 + }, +/obj/structure/disposalpipe/junction{ + dir = 8 + }, +/obj/effect/turf_decal/evac, +/turf/open/floor/iron, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "xzm" = ( /obj/machinery/holopad, /obj/effect/turf_decal/box, @@ -46780,6 +48392,14 @@ }, /turf/open/floor/iron/dark, /area/ai_monitored/turret_protected/aisat/foyer) +"xzJ" = ( +/obj/structure/fence{ + dir = 8 + }, +/obj/structure/sign/warning/electricshock, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/plating/grass, +/area/asteroid/paradise/surface) "xzV" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -46802,6 +48422,12 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"xAa" = ( +/obj/structure/fence/cut/large{ + dir = 8 + }, +/turf/open/floor/plating/dirt/planetary, +/area/asteroid/paradise/surface) "xAi" = ( /obj/structure/chair/office/light{ dir = 1 @@ -46834,6 +48460,18 @@ /area/hallway/primary/fore{ name = "-1 Primary Hallway" }) +"xAU" = ( +/obj/structure/chair{ + dir = 1 + }, +/obj/effect/turf_decal/tile/neutral/anticorner/contrasted, +/obj/machinery/light/small, +/obj/effect/turf_decal/siding/white{ + alpha = 100; + dir = 6 + }, +/turf/open/floor/iron, +/area/medical/medbay/central) "xBc" = ( /obj/machinery/door/airlock/maintenance_hatch{ name = "Maintenance Hatch"; @@ -46854,6 +48492,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/plating, /area/security/brig) +"xBv" = ( +/obj/effect/turf_decal/sand/plating, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/computer/shuttle_flight/custom_shuttle/exploration, +/turf/open/floor/iron/techmaint/planetary, +/area/asteroid/paradise/surface) "xBP" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -46900,6 +48547,16 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/security/brig) +"xCK" = ( +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/structure/cable{ + icon_state = "0-8" + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "xCQ" = ( /obj/structure/railing{ dir = 1 @@ -47029,6 +48686,10 @@ }, /turf/open/floor/iron/tech, /area/engine/engineering) +"xGU" = ( +/obj/structure/flora/junglebush/large, +/turf/open/floor/plating/asteroid/basalt/planetary, +/area/asteroid/paradise) "xHy" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/cable/yellow{ @@ -47055,20 +48716,6 @@ /obj/structure/sign/warning/securearea, /turf/closed/wall/r_wall, /area/maintenance/department/engine) -"xIa" = ( -/obj/structure/window/plasma/reinforced{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/manifold4w/green/visible, -/obj/structure/cable{ - icon_state = "0-8" - }, -/obj/machinery/power/rad_collector/anchored, -/obj/structure/extinguisher_cabinet{ - pixel_y = 32 - }, -/turf/open/floor/plating, -/area/engine/supermatter) "xIm" = ( /obj/structure/chair/fancy/bench{ dir = 8 @@ -47079,19 +48726,6 @@ }, /turf/open/floor/iron/dark, /area/quartermaster/storage) -"xIn" = ( -/obj/effect/turf_decal/siding/wideplating/dark{ - dir = 8 - }, -/obj/structure/table/reinforced, -/obj/machinery/computer/med_data/laptop{ - dir = 4; - pixel_x = 2; - pixel_y = 2 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/carpet/blue, -/area/crew_quarters/heads/cmo) "xIr" = ( /obj/structure/table/glass, /obj/machinery/reagentgrinder{ @@ -47109,7 +48743,7 @@ pixel_x = -24 }, /obj/structure/cable/yellow{ - icon_state = "0-4" + icon_state = "0-2" }, /turf/open/floor/iron, /area/medical/apothecary) @@ -47160,20 +48794,6 @@ /obj/effect/spawner/room/threexthree, /turf/open/floor/plating, /area/maintenance/department/medical/morgue) -"xJE" = ( -/obj/structure/table, -/obj/item/geiger_counter{ - pixel_x = 6; - pixel_y = 3 - }, -/obj/item/toy/plush/plushvar{ - pixel_x = -2; - pixel_y = 9 - }, -/turf/open/floor/iron/dark, -/area/engineering/hallway{ - name = "Engineering Viewing Platform" - }) "xJJ" = ( /obj/item/radio/intercom{ dir = 1; @@ -47369,20 +48989,9 @@ /obj/structure/chair/stool/directional/west, /turf/open/floor/plating/beach/sand, /area/asteroid/paradise/surface) -"xOh" = ( -/obj/effect/turf_decal/stripes/line, -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8; - name = "Gas to Filter" - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/iron/dark, -/area/engine/engineering) -"xOO" = ( -/obj/structure/closet, -/obj/effect/spawner/lootdrop/maintenance/two, -/turf/open/floor/plating, -/area/maintenance/department/chapel) +"xOo" = ( +/turf/closed/wall/mineral/titanium/nodiagonal, +/area/asteroid/paradise/surface) "xPb" = ( /obj/effect/turf_decal/siding/wideplating/terracotta/corner{ dir = 8 @@ -47396,20 +49005,23 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/effect/turf_decal/siding/white/corner{ - dir = 1 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, /turf/open/floor/iron/white, /area/medical/medbay/central) -"xQh" = ( -/obj/effect/turf_decal/siding/wood, -/obj/machinery/airalarm/directional/north, -/obj/effect/spawner/randomvend/cola, -/turf/open/floor/carpet/green, -/area/crew_quarters/cafeteria) +"xPV" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/iron/dark/side, +/area/hallway/primary/aft{ + name = "-3 Primary Hallway" + }) +"xQe" = ( +/obj/machinery/computer/card, +/obj/item/radio/intercom{ + dir = 1; + pixel_x = 1; + pixel_y = 23 + }, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/hop) "xQu" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -47446,6 +49058,19 @@ }, /turf/open/floor/wood, /area/chapel/office) +"xRg" = ( +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-4" + }, +/obj/structure/cable{ + icon_state = "2-4" + }, +/obj/effect/turf_decal/sand/plating, +/turf/open/floor/catwalk_floor/iron_dark, +/area/asteroid/paradise/surface) "xRl" = ( /obj/structure/extinguisher_cabinet{ pixel_x = 25 @@ -47485,25 +49110,26 @@ }, /turf/open/floor/iron/white, /area/science/lab) -"xRD" = ( -/obj/effect/decal/cleanable/dirt, -/obj/effect/turf_decal/stripes/line{ - dir = 8 +"xRv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 9 }, -/obj/effect/turf_decal/stripes/line{ - dir = 4 +/obj/structure/table/wood, +/obj/item/flashlight/lamp/green{ + pixel_x = -6; + pixel_y = 14 }, -/obj/machinery/door/poddoor/shutters/preopen{ - id = "quarantineshutters"; - name = "isolation shutters" +/obj/item/bikehorn/rubberducky{ + pixel_x = -7; + pixel_y = 4 }, -/obj/machinery/door/airlock/maintenance_hatch{ - name = "Medbay Maintenance"; - req_access_txt = "5" +/obj/item/storage/photo_album{ + pixel_x = 3; + pixel_y = -1 }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/dark, -/area/maintenance/department/medical/central) +/obj/item/radio/intercom/directional/north, +/turf/open/floor/carpet/blue, +/area/crew_quarters/heads/captain/private) "xRJ" = ( /obj/machinery/door/poddoor/shutters/radiation/preopen{ id = "engsm"; @@ -47547,6 +49173,15 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer4, /turf/open/floor/iron, /area/security/prison) +"xTb" = ( +/obj/item/beacon{ + pixel_y = 3 + }, +/obj/machinery/ai_slipper{ + uses = 10 + }, +/turf/open/floor/wood, +/area/crew_quarters/cafeteria) "xTu" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -47666,8 +49301,12 @@ name = "-3 Primary Hallway" }) "xVu" = ( -/obj/structure/ladder, -/turf/open/floor/pod/dark, +/obj/effect/turf_decal/trimline/yellow, +/obj/structure/lattice/catwalk/over, +/obj/structure/cable/yellow{ + icon_state = "2-16" + }, +/turf/open/floor/plating, /area/maintenance/department/chapel) "xVE" = ( /obj/effect/turf_decal/sand/plating, @@ -47727,6 +49366,23 @@ }, /turf/open/floor/wood/broken, /area/crew_quarters/cafeteria) +"xWK" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/obj/structure/frame/computer{ + anchored = 1; + dir = 8 + }, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/dark, +/area/hallway/primary/fore{ + name = "-1 Primary Hallway" + }) "xXi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 4 @@ -47748,6 +49404,15 @@ }, /turf/open/floor/iron, /area/security/brig) +"xXl" = ( +/obj/structure/rack, +/obj/item/stack/cable_coil/white, +/obj/item/circuitboard/machine/rtg/advanced{ + pixel_x = -1; + pixel_y = -3 + }, +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "xXE" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -47802,17 +49467,6 @@ }, /turf/open/floor/iron/techmaint/planetary, /area/storage/tech) -"xZy" = ( -/obj/structure/railing/corner{ - dir = 1 - }, -/obj/effect/turf_decal/siding/dark/corner{ - dir = 1 - }, -/turf/open/floor/iron, -/area/hallway/primary/central{ - name = "-2 Primary Hallway" - }) "xZI" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 @@ -47823,6 +49477,17 @@ }, /turf/open/floor/iron/white, /area/science/xenobiology) +"yak" = ( +/obj/effect/turf_decal/tile/neutral/fourcorners/contrasted, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/components/unary/thermomachine/freezer{ + dir = 8; + initialize_directions = 8 + }, +/turf/open/floor/iron/tech, +/area/engine/engineering) "yaq" = ( /turf/closed/wall/rust, /area/science/server) @@ -47870,27 +49535,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/closed/wall, /area/maintenance/department/crew_quarters/dorms) -"ycb" = ( -/obj/machinery/hydroponics/constructable, -/obj/item/paper/guides/jobs/hydroponics{ - pixel_x = 6 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/west, -/obj/structure/sign/warning/nosmoking/circle{ - pixel_x = -32 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/cable/yellow{ - icon_state = "1-2" - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/grid/steel, -/area/hydroponics) "ycc" = ( /obj/effect/turf_decal/stripes/corner{ dir = 4 @@ -48004,6 +49648,13 @@ slowdown = 0 }, /area/asteroid/paradise/surface) +"yeM" = ( +/obj/structure/flora/rock/pile, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/decal/cleanable/dirt/dust, +/turf/open/floor/mineral/titanium, +/area/asteroid/paradise/surface) "yeS" = ( /obj/structure/stairs{ dir = 8 @@ -48032,16 +49683,18 @@ dir = 9; network = list("ss13","medbay") }, -/obj/machinery/power/apc/auto_name/directional/north, /obj/machinery/light/small{ dir = 1 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, /obj/machinery/vending/wallmed{ pixel_x = -32 }, +/obj/machinery/power/apc/auto_name/directional/north{ + pixel_y = 24 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, /turf/open/floor/iron/grid/steel, /area/medical/medbay/central) "yfP" = ( @@ -48052,6 +49705,14 @@ /area/hallway/primary/aft{ name = "-3 Primary Hallway" }) +"yfQ" = ( +/obj/machinery/power/solar{ + id = "portsolar"; + name = "Port Solar Array" + }, +/obj/structure/cable, +/turf/open/floor/iron/solarpanel, +/area/asteroid/paradise/surface) "yfW" = ( /obj/effect/turf_decal/tile/neutral, /obj/effect/decal/cleanable/dirt/dust, @@ -48072,6 +49733,16 @@ /area/hallway/primary/central{ name = "-2 Primary Hallway" }) +"ygK" = ( +/obj/structure/extinguisher_cabinet{ + pixel_x = -28 + }, +/obj/machinery/ore_silo, +/obj/effect/turf_decal/delivery, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/dark, +/area/security/nuke_storage) "ygN" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -48110,29 +49781,27 @@ /obj/effect/decal/cleanable/food/egg_smudge, /turf/open/floor/iron/cafeteria, /area/crew_quarters/kitchen) -"yjl" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ +"yjV" = ( +/obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/machinery/atmospherics/pipe/simple/dark/visible{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/engine/engineering) +/turf/open/floor/plating/asteroid/planetary, +/area/asteroid/paradise/surface) "yjX" = ( /obj/effect/spawner/structure/window/plasma/reinforced, /obj/machinery/atmospherics/pipe/simple/green/visible, /turf/open/floor/plating, /area/engine/supermatter) "ykL" = ( +/obj/structure/disposalpipe/segment{ + dir = 8 + }, +/obj/effect/mapping_helpers/simple_pipes/supply_scrubber/hidden, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "4-8" + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" }, /turf/open/floor/iron/grid/steel, /area/medical/patients_rooms) @@ -48882,11 +50551,11 @@ jsp jsp jsp jsp -vqI -vqI -jsp -jsp -jsp +jsp +jsp +jsp +jsp +jsp jsp jsp jsp @@ -49140,16 +50809,16 @@ vqI jsp jsp jsp -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI jsp -vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp jsp jsp jsp @@ -49396,17 +51065,17 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp jsp jsp jsp @@ -49654,6 +51323,17 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +vqI +vqI vqI vqI vqI @@ -49666,19 +51346,8 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI -jsp -jsp vqI vqI vqI @@ -49911,6 +51580,14 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -49922,15 +51599,7 @@ vqI vqI vqI vqI -jsp -jsp vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -50169,19 +51838,6 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI jsp jsp jsp @@ -50217,167 +51873,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp -"} -(9,1,1) = {" -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -jsp -jsp -jsp -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI vqI vqI vqI @@ -50399,13 +51894,136 @@ jsp jsp jsp jsp +"} +(9,1,1) = {" +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh jsp jsp jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -50439,6 +52057,44 @@ vqI vqI vqI vqI +vqI +vqI +vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -50476,6 +52132,19 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -50683,6 +52352,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -50696,11 +52370,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -50940,6 +52609,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -50953,11 +52627,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -51196,6 +52865,13 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -51209,13 +52885,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -51453,6 +53122,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -51466,11 +53140,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -51711,6 +53380,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -51724,10 +53397,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -51968,7 +53637,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI +jsp vqI vqI vqI @@ -51981,12 +53655,7 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI -jsp vqI vqI vqI @@ -52224,19 +53893,6 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI jsp jsp jsp @@ -52278,6 +53934,19 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -52481,6 +54150,13 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -52494,13 +54170,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -52738,6 +54407,14 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -52751,14 +54428,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -52995,6 +54664,14 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -53008,14 +54685,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -53253,6 +54922,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -53266,10 +54939,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -53511,6 +55180,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -53524,10 +55197,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -53768,6 +55437,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -53781,11 +55455,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -54025,6 +55694,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -54038,11 +55712,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -54282,6 +55951,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -54295,11 +55969,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -54539,6 +56208,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -54552,11 +56226,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -54796,6 +56465,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -54809,10 +56482,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -55054,6 +56723,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -55067,10 +56740,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -55310,6 +56979,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -55323,12 +56998,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -55569,6 +57238,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -55582,10 +57255,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -55825,6 +57494,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -55838,12 +57513,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -56083,6 +57752,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -56096,10 +57769,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -56340,6 +58009,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -56353,12 +58028,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -56597,6 +58266,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -56610,11 +58284,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -56854,6 +58523,10 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp vqI vqI vqI @@ -56867,10 +58540,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp vqI vqI vqI @@ -57111,6 +58780,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -57124,11 +58798,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -57343,14 +59012,14 @@ mOp wnT dcZ rrg -lmb +qYP mcO kCM -hbl +jDe uli mgL bKc -ugw +eur cnW qdc tIa @@ -57369,6 +59038,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -57382,11 +59056,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -57602,15 +59271,15 @@ dcZ rrg xJR rrg -iGq -iGq +vXr +vXr tHO drz drz igh nzj raX -tRy +ePf hfq fUi drz @@ -57626,6 +59295,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -57639,11 +59313,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -vqI vqI vqI vqI @@ -57859,14 +59528,14 @@ maU lEu mht ehf -wzb +sfR jOo uli fWy qMR tFX hZv -tfQ +eYC rVx aDD eyD @@ -57883,6 +59552,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -57895,11 +59569,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -58116,14 +59785,14 @@ wnT ptc rhv gCM -rba +nWb jOo uli xyG tuT cEi qyw -oZt +mrp jhG bov tnQ @@ -58141,6 +59810,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +vqI +vqI vqI vqI vqI @@ -58151,12 +59826,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -58344,7 +60013,7 @@ pYd kUF azS iaR -gAh +jrB ibj ibj hYk @@ -58373,14 +60042,14 @@ dcZ lEu bnh qQW -rba +nWb jOo tHO uli tHO iZg gOe -sKx +nZZ grS dao oga @@ -58398,6 +60067,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +vqI vqI vqI vqI @@ -58408,12 +60083,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -58630,14 +60299,14 @@ dcZ lEu bod vHR -wzb -jOo +sfR +epb jOo jRB vgG vZP xQu -aby +ajX dXj ssw llI @@ -58655,6 +60324,12 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +jsp +vqI vqI vqI vqI @@ -58666,12 +60341,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -58887,14 +60556,14 @@ wnT lEu dMS lEu -dMS +aZV jOo giS bJq lho yiO xQu -uSM +pXK tRy ssw iiY @@ -58902,7 +60571,7 @@ lAn nXA mmp nXA -sLz +eZZ xqU vgR vqI @@ -58913,6 +60582,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +vqI vqI vqI vqI @@ -58923,11 +60597,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -59144,14 +60813,14 @@ jAN iOA pUm rmX -lEu +ttw jOo jOo jOo vgG xUc lly -fia +bVo ycz hAX bxD @@ -59170,6 +60839,11 @@ vqI vqI vqI vqI +jsp +jsp +jsp +jsp +vqI vqI vqI vqI @@ -59180,11 +60854,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -59365,7 +61034,7 @@ xaM eXB jES wys -mOA +bEQ bWw eHY eop @@ -59401,14 +61070,14 @@ jUr jUr jUr qrO -uly +eJz eJz eJz eJz eJz eJz gHW -xoS +aEB gHW dzW ihL @@ -59420,9 +61089,17 @@ ihL dzW ihL ihL -ihL -ihL fhM +lCB +lCB +lCB +lCB +lCB +lCB +oJl +lCB +lCB +jsp vqI vqI vqI @@ -59433,14 +61110,6 @@ vqI vqI vqI vqI -sLz -mVg -sLz -xqU -sLz -jsp -jsp -jsp vqI vqI vqI @@ -59658,14 +61327,14 @@ bAV oZa tVY qrO -uly -fhP +eJz +ygK rlu tww vci eJz fqM -lll +nQB fVf dzW kMN @@ -59681,25 +61350,25 @@ mTL gNG fUV ozj +qUD +oJl +sLz +lFQ +mVg +lCB +jsp +jsp +vqI +vqI +vqI +vqI +vqI vqI vqI vqI vqI vqI vqI -cFP -ycy -rNv -vDt -sLz -sLz -lFQ -blO -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -59888,8 +61557,8 @@ wys wys wys mpz -kPr -wfP +oOz +cgI fsr noh oNp @@ -59915,14 +61584,14 @@ waf tVY bxE tZK -uly +eJz tpD tHB jxW lsu eJz qUr -ipm +hLa cQe nAD fAi @@ -59939,24 +61608,24 @@ cFP xqU xwe uKf -fXo -bxR -fXo -fXo -gRo -nLv -nLv -uxz -eTK -neA +sqm eTK aST xqU +lCB jsp jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -60179,7 +61848,7 @@ cBs hBl eJz mEL -udm +lYg pfU teA cxL @@ -60196,21 +61865,11 @@ mFt cEu trB dwq -taZ -wsA -xUr -uxo -pdu -mVg -sLz -vqI -qnY -sLz -blO +oJl +wAx jmP sLz -sLz -jsp +oJl jsp jsp vqI @@ -60244,6 +61903,16 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -60429,14 +62098,14 @@ tVY tVY tVY sGX -uly +eJz qlj tHB bAQ -klr +ssy eJz kvM -vUQ +wHv qwZ nAD xsc @@ -60449,27 +62118,27 @@ aLz ihL kEO fhM -xgK -rNv -fsF -cEk -ozj -sLz -blO -dbV -cEk +lCB +tOu +qki +xoi +oJl +lCB +lCB +oJl +oJl +jsp +jsp +vqI +vqI +vqI +vqI +vqI vqI vqI vqI vqI vqI -adG -sLz -xqU -jsp -jsp -jsp -jsp vqI vqI vqI @@ -60673,7 +62342,7 @@ fEV gee kBA fMX -soz +qjP dlh rru viT @@ -60684,20 +62353,20 @@ cfv xoc gWp jPg -qrl +hgS pjs -uly +eJz kDx pIl ptb roc eJz gHW -aAY +jkI gHW pyW bRk -vZI +cAK pUZ ihL xgK @@ -60706,11 +62375,17 @@ dbV uBt cEk mVg -sLz +xGU xTD mIF sXg -cEk +vqI +vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -60720,12 +62395,6 @@ vqI vqI vqI vqI -jsp -sLz -sLz -jsp -jsp -jsp vqI vqI vqI @@ -60950,7 +62619,7 @@ eJz eJz eJz qOg -gXc +azL yaU kbq dzW @@ -60969,6 +62638,12 @@ mFT sLz vqI vqI +jsp +jsp +jsp +jsp +jsp +vqI vqI vqI vqI @@ -60977,12 +62652,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -61207,13 +62876,13 @@ qdG vLP xTu eOD -gXc +azL jFC pVY uUK uRJ ecq -aOy +bgo sXB gqv gqv @@ -61226,6 +62895,14 @@ mGS blO vqI vqI +jsp +jsp +jsp +jsp +jsp +vqI +vqI +vqI vqI vqI vqI @@ -61233,14 +62910,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -61463,8 +63132,8 @@ amy pWS iNo rzg -cTC -upw +kzr +wyz oNv wON jsW @@ -61474,8 +63143,8 @@ aaU qEU qRN qBw -wNO -apY +pQS +oer biV sXB blO @@ -61484,18 +63153,18 @@ xqU hJN vqI vqI +jsp +jsp +jsp +jsp +jsp +vqI vqI vqI vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -61701,7 +63370,7 @@ sjJ lQi wvu fMX -kBh +jiz ovP qaK lxu @@ -61720,20 +63389,20 @@ qWg oeh vLP vgi -mVd -jeF +dLq +rfT udt hAp wdX -rof -kCq -kXq -iPB -bGW +oHn +oHn +vHd +fYP +bmi uAD bcS gPs -idO +mHA lCS hJN wFM @@ -61741,6 +63410,11 @@ ozj cEk vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -61748,11 +63422,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -61977,27 +63646,32 @@ vLP vLP vLP top -lts -nXM +rrt +eUG eCn aIx fMC -bFF -qDU -wTI -cvP -qzg +xwR +jUL +kaW +qeW +two oxg hsv tVm -jOz -lCS +iPj +iQr ndX viX xqU fPc vqI vqI +jsp +jsp +jsp +jsp +jsp vqI vqI vqI @@ -62005,11 +63679,6 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp vqI vqI vqI @@ -62214,15 +63883,15 @@ qMM dqm ndg rzP -rQd +hgw aQK slF hCL -quH -aji -gSL +iIS +cZG +ekb tJv -qKB +gWg gMn sNq tdv @@ -62235,19 +63904,19 @@ tlH pVY pVY vVo -yjl +pOA wWC -scb -vUe -paJ +tKv +mNS +hZM dXI -gWU +glt doY ezZ dXI uAb wzE -pch +nIe lCS eGc mmJ @@ -62255,13 +63924,6 @@ ycy xqU vqI vqI -vqI -vqI -vqI -vqI -vqI -jsp -jsp jsp jsp jsp @@ -62299,6 +63961,13 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -62470,13 +64139,13 @@ wLe wLe lyG iEJ -jkq -cLP -aip -lGE -aAq -lGE -ehm +flm +qge +gZM +jkt +nfQ +pTU +mZC wyJ aRh dfZ @@ -62489,22 +64158,22 @@ vxs nQV sua bHK -onj +oju rZf oFu -yjl +pOA wWC -hDR -dXI -dXI +ijV +vGz +nhl ifQ -xIa -hcF +bUC +nFx cdq xiB lSc uTP -aJw +jIs sXB cFP rzV @@ -62512,13 +64181,6 @@ wyw sLz vqI vqI -vqI -vqI -vqI -vqI -vqI -jsp -jsp jsp jsp jsp @@ -62557,6 +64219,13 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -62727,15 +64396,15 @@ hhH wLe lCP niw -cvt -dNV -wxC -gWa -gWa +oeL +gdO vdf fhR -dvw -pfb +mFz +rLR +aOt +knl +xPV pqi pqi bUT @@ -62746,22 +64415,22 @@ wrb ekN jxc nrc -fpH +bJS wEX pHp -yjl +pOA wWC -pLM +nnQ yjX -sUg -prf +ogE +aeQ hBg hBg hBg baq tfH -jhN -fsU +npY +kwz sXB cEk gNq @@ -62769,12 +64438,6 @@ ccl vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -jsp jsp jsp jsp @@ -62814,6 +64477,12 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -62972,7 +64641,7 @@ weN kOu sDH bUA -jaK +dYY jst llb pqE @@ -62984,40 +64653,40 @@ wLe wLe wLe niw -dRW -tfX -gWa -vdf +nYi rFo gWa eWh -ggo -kgq +nFm +jEa +oTq +sQq +xPV pqi pqi iPP yfP -ept +aEx fZl tlK qbd mEl sMX ldp -mNP +lsV wDK -vwI +xvc vuh -xOh +lAM pCa -dbm +ctk kZz ghT amX dbm xiB lSc -rbv +ipT gPs mAp sLz @@ -63026,13 +64695,6 @@ cEk vqI vqI vqI -vqI -vqI -vqI -vqI -jsp -jsp -jsp jsp jsp jsp @@ -63070,6 +64732,13 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -63241,15 +64910,15 @@ wLe wLe dqm niw -mcX -ezq -iox -gWa -gWa +unh +nHh gWa vQZ -uqn -pfb +kMZ +rLR +aOt +oPa +xPV pqi pqi unI @@ -63260,22 +64929,22 @@ pjF gHq hBY cSZ -ewS +gEl rMf pHp -yjl +pOA wWC -tBj -vvK -oWG -pdk +vGd +pIB +wgA +grx vmu vmu vmu baq fzZ -jhN -aof +npY +tUx lCS vqI hTd @@ -63283,12 +64952,6 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -jsp -jsp jsp jsp jsp @@ -63328,6 +64991,12 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -63484,7 +65153,7 @@ eXB eaA hhu hhu -vlw +ecH vlw hSk tov @@ -63498,13 +65167,13 @@ wLe wLe lyG iEJ -prw -qGC -lfX -sPu +gQY qWU sPu jhV +rLR +rLR +qGC xjz bOk gQE @@ -63517,18 +65186,18 @@ gzS gCg uWx kaw -gNi +aAj fFu pHp -yjl +pOA wWC -vdB -dXI -dXI +oQF +pGF +kXp ocx -nVe -pBc -tSB +nKs +dZF +blt xiB lSc uTP @@ -63540,12 +65209,6 @@ rNv vqI vqI vqI -vqI -jsp -jsp -jsp -jsp -jsp jsp jsp jsp @@ -63584,6 +65247,12 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -63760,9 +65429,9 @@ lEl cUr mLL jET -neD -qGC -bqy +izi +gzS +hog cen oIi oIi @@ -63774,16 +65443,16 @@ dPx sCr wNN sui -gQn +sjD rIZ pHp -mzu +cmT wWC -bRj -jwj -ejS +kQJ +fap +eEl dXI -cSb +hST xRJ gFg dXI @@ -63797,11 +65466,6 @@ vph vqI vqI vqI -vqI -vqI -jsp -jsp -jsp jsp jsp jsp @@ -63841,6 +65505,11 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -64034,18 +65703,18 @@ pVY pVY dta kXQ -ejo +kHt dHA +tcS gYA -gYA -wpu -dkl -aje +oYL +wef +cdn taA -ePy -eib -azB -oYA +fWn +sBO +kIV +lDA gPs mAp rET @@ -64053,11 +65722,6 @@ sGK cEk vqI vqI -vqI -vqI -vqI -jsp -jsp jsp jsp jsp @@ -64097,6 +65761,11 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -64293,13 +65962,13 @@ aLe pkS tts tRY -nwE -vmX -hFu -rjh -rko -eam -hOv +jTE +gdb +kKL +lvc +ecx +dzb +yak ooF xGG bTY @@ -64310,11 +65979,6 @@ xhE vqI vqI vqI -vqI -jsp -jsp -jsp -jsp jsp jsp jsp @@ -64353,6 +66017,11 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -64537,21 +66206,21 @@ qXK gBj dKK iZu -dTP +bYp sFh qXK evW -woV +nvz lEQ cvu hos khm ajT fQW -wTG +hag hNJ hNJ -nrc +qms bfI bfI bfI @@ -64567,10 +66236,6 @@ xgK vqI vqI vqI -vqI -jsp -jsp -jsp jsp jsp jsp @@ -64608,6 +66273,10 @@ vqI vqI vqI vqI +vqI +vqI +vqI +vqI jsp jsp jsp @@ -64819,7 +66488,7 @@ eoQ pNb oMm sXB -jsp +vqI vqI vqI vqI @@ -64830,9 +66499,9 @@ jsp jsp jsp jsp -jsp -jsp -jsp +vqI +vqI +vqI vqI vqI vqI @@ -65076,21 +66745,21 @@ pwo dEz vpm sXB +vqI +vqI +vqI jsp jsp jsp jsp jsp jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -65332,6 +67001,9 @@ sXB sXB sXB sXB +vqI +vqI +vqI jsp jsp jsp @@ -65339,14 +67011,11 @@ jsp jsp jsp jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -65549,7 +67218,7 @@ ofT qjd lTB sVZ -loO +gAp loD lxZ tzP @@ -65598,11 +67267,11 @@ jsp jsp jsp jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -65854,12 +67523,12 @@ jsp jsp jsp jsp -jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -66065,7 +67734,7 @@ gkv bDV mDA loD -dBm +jso tzP ptP jZr @@ -66078,12 +67747,12 @@ hNR vnh wgL gkj -thD -thD -wjS -apX -njB -orX +hpW +aoV +dgd +aEM +inn +hzQ rZy wey sXB @@ -66109,11 +67778,11 @@ jsp jsp jsp jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -66335,12 +68004,12 @@ jkp hyN qmz amO -ayq +lhR aSf -qZq +niR aEM -boV -orX +woV +hzQ uWW uFy sXB @@ -66365,12 +68034,12 @@ jsp jsp jsp jsp -jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -66576,7 +68245,7 @@ loD tOz bSm txF -iLL +bjB eIe loD dBm @@ -66591,13 +68260,13 @@ rrn yaq aet aAh -aCC -aRV -aRV -aOO -apX -pVO -ggs +rlo +lfV +rRm +ssu +aEM +hzQ +hzQ gnc euN tdh @@ -66618,14 +68287,14 @@ vqI vqI vqI vqI -jsp -jsp -jsp -jsp -jsp -jsp -jsp -jsp +vqI +vqI +vqI +vqI +vqI +vqI +vqI +vqI vqI vqI vqI @@ -66836,7 +68505,7 @@ loD loD loD loD -pCT +lPj sWe pzQ saM @@ -66853,8 +68522,8 @@ pMW pMW pMW eIc -orX -orX +hzQ +eqW ujX sNC wqF @@ -66879,9 +68548,9 @@ vqI vqI vqI vqI -jsp -jsp -jsp +vqI +vqI +vqI vqI vqI vqI @@ -67093,7 +68762,7 @@ saM nCa saM kJM -bEo +trI vet kyK saM @@ -67111,7 +68780,7 @@ inn inn woV eqW -lsH +uet hCs hzQ btw @@ -67350,12 +69019,12 @@ saM nnl lIL dUi -azo +lQr mPj qZI ghc wZm -fcL +eoh gnR fjp xmA @@ -67617,7 +69286,7 @@ sWe lAu bvF sdK -eqW +kHe eqW wNL orX @@ -119249,13 +120918,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +kQw +kQw +kQw +kQw +kQw +kQw vqI vqI vqI @@ -119506,13 +121175,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +naX +pXA +luF +twg +nub +kQw vqI vqI vqI @@ -119763,13 +121432,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +vaT +luF +luF +pXA +qlO +kQw vqI vqI vqI @@ -120020,13 +121689,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +egS +luF +luF +luF +rxA +kQw vqI vqI vqI @@ -120277,13 +121946,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +vhX +pXA +luF +luF +dbT +kQw vqI vqI vqI @@ -120534,13 +122203,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +iyC +pXA +luF +luF +iyC +kQw vqI vqI vqI @@ -120791,13 +122460,13 @@ vqI vqI vqI vqI -vqI -vqI -vqI -vqI -vqI -vqI -vqI +kQw +pei +luF +luF +luF +iyC +kQw vqI vqI vqI @@ -121049,11 +122718,11 @@ vqI vqI vqI kQw -kQw -kQw -kQw -kQw -kQw +iyL +luF +luF +luF +iyC kQw vqI vqI @@ -121306,11 +122975,11 @@ vqI vqI vqI kQw -fnQ -fnQ -fnQ -fnQ -rPI +kxR +pXA +luF +luF +kSY kQw kQw kQw @@ -121563,11 +123232,11 @@ vqI vqI vqI kQw -fnQ -fnQ -qMa -fnQ -fnQ +naX +pXA +luF +pXA +jDz kQw fnQ fnQ @@ -121820,11 +123489,11 @@ kQw kQw kQw kQw -fnQ -fnQ -fnQ -fnQ -fnQ +bnO +jZf +pXA +pXA +nub sHr fnQ fnQ @@ -122079,7 +123748,7 @@ rPI kQw kQw kQw -sHr +uRt kQw kQw kQw @@ -122335,9 +124004,9 @@ fnQ fnQ sHr luF -dzw -dzw -luF +giQ +aVH +rcr lGc xsQ xsQ @@ -122593,8 +124262,8 @@ fnQ kQw uhy gsF -eWL -eWL +uWn +kzK eWL qdO eWL @@ -122602,7 +124271,7 @@ eWL tGT tGT kND -pJO +mVt vcY hqw pjN @@ -123377,7 +125046,7 @@ jKK kKx lTW kdJ -tpN +ohx vyl pvV bup @@ -123635,7 +125304,7 @@ lUo hjp fRu lKm -axZ +lyZ iwF xYT hph @@ -123890,8 +125559,8 @@ fUc aBy mxW lTW -kzD -gMC +kdJ +ozT ozT qhg xYT @@ -124139,8 +125808,8 @@ eNz orD anu cmD -suO -gyO +exl +kPl gyO xgH ujn @@ -124149,8 +125818,8 @@ aHq mtn ill cbP -ozT -ozT +abN +ohx epj xYT bGO @@ -124398,7 +126067,7 @@ bDD bYj bDD bDD -eXn +rjf xgH xgH udq @@ -124407,7 +126076,7 @@ tnA aaz uld oyg -ozT +ohx uTt xYT ned @@ -124435,13 +126104,13 @@ wjm scX eHd sPE -rqF -rqF -rqF -rqF -rqF -rqF -rqF +tHO +tHO +tHO +tHO +tHO +tHO +tHO vqI vqI vqI @@ -124651,11 +126320,11 @@ cOp cOp ogJ tay -ycb +lQd jGY myl bDD -liG +jqp coF ttY vkb @@ -124664,10 +126333,10 @@ gDc azd gHV brZ -ozT +ohx tFb xYT -bEe +pfq tih aNk rjD @@ -124912,14 +126581,14 @@ wAN aKH iYE bDD -suO +drs ttY ttY vkb vkb wYL fMk -aID +gHV wjR axZ ubl @@ -124961,6 +126630,11 @@ vqI vqI vqI vqI +oJl +oJl +oJl +oJl +oJl vqI vqI vqI @@ -124970,11 +126644,6 @@ vqI vqI vqI vqI -oJl -oJl -oJl -oJl -oJl vqI vqI vqI @@ -125169,13 +126838,13 @@ rGq wMY rSE bDD -gyO +fWF ttY yfd qJT jLG xPe -rJG +fMk cxj gND ykL @@ -125218,6 +126887,11 @@ vqI vqI vqI vqI +oJl +bvw +bvw +bvw +oJl vqI vqI vqI @@ -125227,11 +126901,6 @@ vqI vqI vqI vqI -oJl -bvw -bvw -bvw -oJl vqI vqI vqI @@ -125426,7 +127095,7 @@ tNz pbw wQW bDD -eXn +rjf ttY kAS hyo @@ -125435,7 +127104,7 @@ pcu hvh jME jME -dqV +tCQ jME jME eUh @@ -125475,6 +127144,11 @@ vqI vqI vqI vqI +oJl +bvw +bvw +bvw +oJl vqI vqI vqI @@ -125484,11 +127158,6 @@ vqI vqI vqI vqI -oJl -bvw -bvw -bvw -oJl vqI vqI vqI @@ -125685,10 +127354,10 @@ thO bDD fjc wMW -hrF +qdZ hrF cIY -mIN +lbv fcl nKL xIr @@ -125732,6 +127401,11 @@ vqI vqI vqI vqI +oJl +bvw +bvw +bvw +oJl vqI vqI vqI @@ -125741,11 +127415,6 @@ vqI vqI vqI vqI -oJl -bvw -bvw -bvw -oJl vqI vqI vqI @@ -125945,7 +127614,7 @@ ttY mBp uxt qxQ -mIN +teo hUj htB ptj @@ -125960,7 +127629,7 @@ fZm vXz uNk vqE -rSl +dwr wrf cxE tLm @@ -125989,6 +127658,11 @@ vqI vqI vqI vqI +oJl +oJl +oJl +oJl +oJl vqI vqI vqI @@ -125998,11 +127672,6 @@ vqI vqI vqI vqI -oJl -oJl -oJl -oJl -oJl vqI vqI vqI @@ -126450,7 +128119,7 @@ aWb acj thc nRX -oBX +uQq aDn iIl bDD @@ -126717,7 +128386,7 @@ byq tND kQc jxa -aUc +mIN ueO leg tOU @@ -126751,7 +128420,7 @@ eMV afq xvQ eMV -xiW +jKl skf skf skf @@ -126977,7 +128646,7 @@ obC elK oEZ nkb -nkb +stZ jME wZF rId @@ -126988,7 +128657,7 @@ bPo vHu ueV vqE -aVM +jrl qao iTA oEl @@ -127213,7 +128882,7 @@ eyu wdv eyu hhu -xQh +wxQ tov pUp jNl @@ -127231,14 +128900,14 @@ xpy xpy oCL xWj -wnk +wxm wxm gDp -oRV -owJ -upV +tXw +gDp +xiD rId -rkF +tIU xpy fOY xpy @@ -127488,23 +129157,23 @@ sfL rFm rFm dme -tAz vcM -ktf -dkP +vcM +uAS cPh -rjj -mgp +vYy +vTn +gAf vdC -nmp -aWp -oNr -eiN +hCo +hCo +vsG +iTy vYe -oCj -bVi +vuZ +gsi mAj -uWl +aoI cCz oEl jlR @@ -127742,24 +129411,24 @@ psY hAV clc eWf +qRu rId +qRu rId -rId -rId -rId +qRu lpc -rql -cHd -fQH qYc -oqs -eWf -qRu -qRu -xgC -bev -teC -kMR +lkw +lkw +fBA +lkw +lkw +cHd +gYQ +lgS +ttG +huH +oeG wqX wLQ dCq @@ -127998,24 +129667,24 @@ tbo uxJ iyn jzj -rId -rId -rId -rId -rId -rId -rId -urX -bDC qRu -urX -rIe -rId rId rId +qRu rId rId +qRu +vvA +xwU +xwU +xwU +xwU +xwU +aQF +hmF +qRu rId +qRu enr kvW mWk @@ -128033,11 +129702,11 @@ fWA rxI qNE iYB -cMr +wWL jnE jnE -bzU -uhf +aVl +bPL kBd voA ifA @@ -128255,22 +129924,22 @@ gyy gak iyn jzj +qRu rId rId +qRu rId rId +qRu +vvA +xwU +xwU +xwU +xwU +xwU +aJI rId -rId -rId -urX -bDC -rId -urX -rIe -rId -rId -rId -rId +qRu rId rId rId @@ -128287,15 +129956,15 @@ cLN ujl wdj kBd -eFA -qDP +iUt +uOa iYB hYe -qzs -uTj -uTj -cLt -aLS +uOa +uOa +uOa +oEI +kBd voA ifA gqb @@ -128501,7 +130170,7 @@ hhu jHF hVF lfw -oRx +xTb mzC wzi qgB @@ -128511,27 +130180,27 @@ gyy gyy gak bzr -jzj -rId -rId -rId -rId -rId -rId -rId -urX -bDC -tVu -urX -rIe -rId -rId -rId +dQy +wex +wex +wex +wex +tai +wex +wex +sPK +xwU +xwU +uOf +xwU +xwU +aJI rId +qRu rId rId rId -psZ +cRE kZN qpi bjl @@ -128544,15 +130213,15 @@ nDD tUN rcE kBd -ifA -rxI +iUt +uOa iYB -hYe -bdG -ifA -ifA -cLt -voA +moC +uOa +uOa +uOa +wIO +eIb tOw voA gqb @@ -128769,22 +130438,22 @@ gyy gak iyn jzj +qRu rId rId +qRu rId rId +qRu +vvA +xwU +xwU +xwU +xwU +xwU +aJI rId -rId -rId -urX -bDC -rId -urX -rIe -rId -rId -rId -rId +qRu rId rId rId @@ -128801,15 +130470,15 @@ vJG aoH oru kBd -xJN -eMU +iUt +uOa iYB hYe -lVT -cuW -cuW -cLt -jpU +uOa +uOa +uOa +hwq +kBd voA ifA gqb @@ -129026,31 +130695,31 @@ qsE tju iyn jzj -rId -rId -rId -rId -rId -rId -rId -urX -bDC qRu -urX -rIe -rId rId rId +qRu rId rId +qRu +vvA +xwU +xwU +xwU +xwU +xwU +rvq +hIY +qRu rId +qRu vga cRo wFP ndP psr qjF -siX +pgp flo flo cvA @@ -129061,11 +130730,11 @@ aAy rxI qxa iYB -cwk +mfh gwZ gwZ -iHy -xJE +eFY +kfK kBd voA ifA @@ -129284,24 +130953,24 @@ psY wTn psr ftK +qRu rId +qRu rId -rId -rId -rId +qRu oXd -gYD +aeV +add +add +eNE +add +add vcX +iUO +tDZ uyA -aeV -jHZ -ftK -qRu -qRu -urc uma -qjF -xZy +dOv cNI ndP pKX @@ -129546,21 +131215,21 @@ tHd tHd tHd tHd -eid +xsS +vmg iQq vmg -kvt -rkz +aaX +ndP +ndP +ndP +ndP ndP -psr -qjF -qjF -dOv cZZ -fgO -tTn +vmg +xxV gXk -gJt +iOD lOf ajB ajB @@ -129804,14 +131473,14 @@ tTb tTb tTb tTb +tTb +hYz oMd -sdG -jKp xXi ygB aIl jcz -xrZ +rsf atE iBU bnn @@ -129819,7 +131488,7 @@ eyQ kbW itO ajB -eFt +haE aqw nEW thd @@ -130058,7 +131727,7 @@ pNI pNI sSJ cea -iJe +gaf iSf iSf hKp @@ -130072,7 +131741,7 @@ gMG gMG dLS kfl -cDz +saH oLi cDz ajB @@ -130349,7 +132018,7 @@ hTq hTN utb utb -tzm +onw skf skf skf @@ -130573,8 +132242,8 @@ qur pMI baE uVE -hvK -eBh +iFd +nFX dky ylg gQK @@ -130831,7 +132500,7 @@ fSh baE kti xAi -wql +riG uWg ylg lPV @@ -131087,8 +132756,8 @@ baE baE baE klE -iFd -hZV +hvK +cgQ aGd ylg lji @@ -131327,7 +132996,7 @@ fJW drA oNe xnU -gEP +uyP ehJ ehJ fnC @@ -131341,7 +133010,7 @@ tmO uXy tmO tmO -pAw +hqd uyf iHj geJ @@ -131364,7 +133033,7 @@ mFI nzZ liQ mSE -iTL +xRv vRT imc iSr @@ -131585,7 +133254,7 @@ lqn hoO jqN gEP -ehJ +fNB ehJ iQd rER @@ -131614,7 +133283,7 @@ gMG gMG pcP kfl -tnI +rTr alW hLr cFp @@ -131843,10 +133512,10 @@ gEP gEP gEP fZR -fZR +aTm sNy jSR -koo +xct eKX dfH yik @@ -132097,10 +133766,10 @@ fZR hrC dGK fZR -evs hLc nxt fZR +stR xVu rHO eWv @@ -132129,8 +133798,8 @@ tpM evR kfl riT -wOh -jOC +bpL +bic jZG xtQ hyc @@ -132355,12 +134024,12 @@ pSY pSY fZR bpM -qsH -shJ +ewJ sCm -paX -rER -xct +lHB +qsH +sho +aLo eKX eKX eKX @@ -132612,15 +134281,15 @@ nYE pSY pSY pSY -qsH -uoF +pSY sCm -rPj +iGw +pSY tTE mBS lKU jDq -ncw +ebh wxb tyI ncw @@ -132869,14 +134538,14 @@ xrC pSY pSY pSY -lgt -aIJ -fZR -fZR -oZe -jjc -fZR +eNV fZR +qsH +pSY +pSY +pSY +nEl +pSY fZR uZl iaG @@ -133124,16 +134793,16 @@ fZR fZR lgt pSY -pSY +evs pSY pSY uwE qsH -nVc +qsH sHD -nEl -nEl -xOO +qsH +pSY +pSY fZR hdM olN @@ -133658,7 +135327,7 @@ olN olN pyQ nFR -qxI +dou bOR uuH aAV @@ -134177,7 +135846,7 @@ aAV aAV aAV hrt -ldw +lAS cEZ acU lnY @@ -135718,8 +137387,8 @@ vqI vqI vqI aqu -swV -lEj +kHD +ulq xku ubG uSG @@ -187632,15 +189301,15 @@ oXe oXe oXe oXe -oXe -hiB -bvw -bvw -bvw -bvw -bvw -bvw -bvw +gEN +gEN +pub +pub +pub +pub +pub +pub +pub gEN gEN gEN @@ -187886,18 +189555,18 @@ xMl axc xdL tOf -btO +xdL pdR -kWE -czn -lPu -lPu -lPu -lPu -lPu -lPu -lPu -lPu +jrL +voC +voC +voC +voC +voC +voC +voC +voC +voC gEN cGf rKg @@ -188142,12 +189811,12 @@ hif fmH oXe btO -pdR -xdL -mXm -xMl -qwk -owG +moh +btO +tBy +iYn +bzO +shD aiK kVV otq @@ -188394,16 +190063,16 @@ bJi tOf pdR ouX -eAr +eQW gmU -lwh -oXe -btO -cPw -lUh -tBy btO oXe +cyT +oXe +oXe +oXe +oXe +gEN gEN mxG gEN @@ -188655,19 +190324,19 @@ tst pMt uhc uhc -xRD -uhc -uhc -uhc +okt uhc +fMc +tNm +lOO uhc hwg tAg tAg qhT aiK -iQo -qBR +aiK +aLD aoM jij jij @@ -188911,20 +190580,20 @@ ttY ttY ttY uhc -lEa -tqc -uhc -dhi -tNm -lOO +whz +jUT +hUe +aLU +xjt +rAh uhc hwg rbV tAg qhT aiK -izt -lyE +aiK +aLD aoM jij jij @@ -189168,20 +190837,20 @@ eXz mxY iej uhc -sUS -jUT -hUe -xpI -xjt -rAh +suJ +wmC +iKU +taT +naW +myX uhc qhT qhT qhT qhT -ryh -aiK +pgl aiK +qhT vqE jij jij @@ -189421,16 +191090,16 @@ dgE wDb ibc rPF -cjo +nhC pLs -tjN +xge pTS -gPE -tWb -lol -bAp -mth -azy +mxu +diV +cle +qiD +pVC +mpq uhc pub pub @@ -189438,7 +191107,7 @@ pub tbm kSi aiK -aiK +nlE vqE jij jij @@ -189680,14 +191349,14 @@ iyS iyS pMY oDR -svO +fLs uhc -lVB -dxG -hUe -kyT -btC -uSY +qUt +slT +uhc +dBS +dPK +sGP uhc pub pub @@ -189936,15 +191605,15 @@ pcZ nlH iyS wEt -iDi -thg +eDl +xAU aSN pEf pEf uhc -dBS -dPK -lYc +upP +upP +nrK uhc pub pub @@ -190194,21 +191863,21 @@ pyD jfU ijh wiC +lhc +jwG vQN vQN +usq +vQN vQN vQN -uhc -upP -upP -upP uhc pub pub pub pub vsU -joF +dyQ vqE pDD bdh @@ -190456,9 +192125,9 @@ vQN vQN vQN usq -vQN lVy uFY +uFY dTb voC voC @@ -190497,6 +192166,11 @@ vqI vqI vqI vqI +oJl +oJl +oJl +oJl +oJl vqI vqI vqI @@ -190506,11 +192180,6 @@ vqI vqI vqI vqI -oJl -oJl -oJl -oJl -oJl vqI vqI vqI @@ -190713,16 +192382,16 @@ vQN vQN vQN usq -vQN jHd aiK +aiK eCq -shD -shD -shD -shD -shD -shD +aiK +aiK +aiK +aiK +aiK +aiK orB aQg aTZ @@ -190737,7 +192406,7 @@ fLS qDJ jEu nyO -bHH +nOn vqE vqE vqE @@ -190754,6 +192423,11 @@ vqI vqI vqI vqI +oJl +bvw +bvw +bvw +oJl vqI vqI vqI @@ -190763,11 +192437,6 @@ vqI vqI vqI vqI -oJl -bvw -bvw -bvw -oJl vqI vqI vqI @@ -190966,14 +192635,14 @@ mWS tqW iuG vQN -vQN -vQN -vQN -usq -vQN -vBZ -lhc -dTb +jMW +lNu +qlb +qlb +qlb +qhT +qhT +qhT jor xNh jor @@ -191011,6 +192680,11 @@ vqI vqI vqI vqI +oJl +bvw +bvw +bvw +oJl vqI vqI vqI @@ -191020,11 +192694,6 @@ vqI vqI vqI vqI -oJl -bvw -bvw -bvw -oJl vqI vqI vqI @@ -191223,12 +192892,12 @@ dWn ijh lCL dGt -qLj -oFa -lrR -lrR -lrR oFa +xLY +sxA +mTS +meb +tyF oFa vwd bxq @@ -191268,6 +192937,11 @@ vqI vqI vqI vqI +oJl +bvw +bvw +bvw +oJl vqI vqI vqI @@ -191277,11 +192951,6 @@ vqI vqI vqI vqI -oJl -bvw -bvw -bvw -oJl vqI vqI vqI @@ -191481,11 +193150,11 @@ wxa idj oYY oFa -xLY -lON -mTS -meb -kHm +aLI +lyd +cfJ +hiE +nhz oFa bSX vft @@ -191496,7 +193165,7 @@ vwd pjU aOI xpM -bsL +dDA rEh oMQ tQX @@ -191507,7 +193176,7 @@ uLg xCy xjn sel -aFL +htu kQZ vqE xXk @@ -191525,6 +193194,11 @@ vqI vqI vqI vqI +oJl +oJl +oJl +oJl +oJl vqI vqI vqI @@ -191534,11 +193208,6 @@ vqI vqI vqI vqI -oJl -oJl -oJl -oJl -oJl vqI vqI vqI @@ -191737,12 +193406,12 @@ kxf tpg jnX mFq -hQO -hvZ -iAI -qYy -suk -bHy +rZs +vGc +fGm +xsU +vog +eQh oFa hMj ooN @@ -191994,12 +193663,12 @@ kxf gqC xfO rkK -fUG -rpz -jgJ -cdB -xIn -oLa +tox +nrA +sOB +vYl +tdN +bqm oFa sUh iwr @@ -192251,12 +193920,12 @@ ctU ipu qTU qwF -aPh -stJ -liZ -vYl -tdN -bqm +qey +nmv +swK +gTA +hUc +rLt oFa xCw mWc @@ -192509,11 +194178,11 @@ gim gim gim gim -tRZ -liZ -gTA -hUc -rLt +oFa +eEo +eEo +eEo +eEo oFa vwd uYE @@ -192528,7 +194197,7 @@ jlT dkt axB wQG -mtH +cJd uVd wgi tRD @@ -192767,10 +194436,10 @@ sTd aXF gim gim -eEo -eEo -eEo -eEo +grk +grk +grk +grk oFa ipb ipb @@ -193028,7 +194697,7 @@ nYL nYL nYL nYL -sPG +qPX nYL nYL nYL @@ -193285,7 +194954,7 @@ nYL nYL nYL nYL -ipb +nYL nYL nYL nYL @@ -193542,7 +195211,7 @@ tIw sJH nYL nYL -ipb +nYL nYL nYL nYL @@ -193559,12 +195228,12 @@ nYL nYL nYL gUx -tqM +uMh mMc irp -ayh -jDL -gqj +kPR +kXP +whU nZB bzj fgP @@ -193799,11 +195468,11 @@ eOr swU uAG uAG -ljY uAG uAG uAG -ljY +uAG +uAG lmC frz frz @@ -193817,19 +195486,19 @@ nYL nYL bpo kBY -tkJ -ofn +qtY +fAC cgb -sSN +avB ayl rMs fgP fgP tuo uyF -qgY -qgY -qgY +ljQ +ljQ +ljQ vqI vqI vqI @@ -194073,20 +195742,20 @@ jat nYL nYL nYL -hAh -koS -sgc -rrS -pZI +kBY +lTh +cNG +oLC +rqt uYb wIQ xUk nbj hGq fgF -qgY -qgY -qgY +ljQ +vqI +vqI vqI vqI vqI @@ -194313,7 +195982,7 @@ eOr wRZ rtQ rtQ -tAK +rtQ rtQ nzq frz @@ -194331,19 +196000,19 @@ nYL nYL vRY kBY -fhb -rKr +joi +jnM llU -eBQ +qTn aFR kVj fgP fgP dpo btK -qgY -qgY -qgY +ljQ +vqI +vqI vqI vqI vqI @@ -194570,7 +196239,7 @@ saT ros nYL nYL -ipb +nYL nYL gUx frz @@ -194587,19 +196256,19 @@ nYL nYL nYL gUx -xiv +qEQ bbd mpj -nSK -uUk -rnb +wyu +kUg +jVJ nZB nZB fgP -dpo -rgr gLR -qgY +myY +ljQ +vqI vqI vqI vqI @@ -194827,7 +196496,7 @@ nYL nYL nYL esb -ipb +nYL nYL gUx frz @@ -194846,7 +196515,7 @@ nYL tee wwE tsf -jdU +xWK bYh hAU ceg @@ -195355,7 +197024,7 @@ eMh onx xWg xWg -uwd +wfD lEt gsV eIP @@ -195620,7 +197289,7 @@ xWg fCw dJP sMC -jJL +xyV uSN rsb liA @@ -196127,11 +197796,11 @@ oJf iGr gwH xdD -bCq -twG +pKz +axr lDe dur -iPI +xQe aSp aRP gBO @@ -196379,16 +198048,16 @@ fah aSX gXD xWg -pYO +uXk jRL -geB +bGc fJc eUg -muR -hBv -hBv +uxv +vat +hbu dur -agi +oKf hOi oLn xKs @@ -196641,8 +198310,8 @@ uXm mks gXq aNF -fqz -gPq +nJy +iAz uuD aqx vgF @@ -196650,7 +198319,7 @@ ucC xGw uEY ifB -epZ +caT srJ vqI vqI @@ -196905,7 +198574,7 @@ dur kyY eYp myN -mKi +ppX uup qNq srJ @@ -197150,7 +198819,7 @@ aSX aSX wWF xWg -asd +rfL anP aIR aTg @@ -197162,7 +198831,7 @@ dur qDp uQG rXP -sXp +szu qah qYU srJ @@ -197381,9 +199050,9 @@ xjy cnM rZM way -sld -cBO iTq +jWc +apI eWS jWc jWc @@ -197638,7 +199307,7 @@ bEB rFF rFF rca -sld +czD qId olN olN @@ -197671,7 +199340,7 @@ aRO dkR atd aIF -vYB +uTY oNu uhU lVQ @@ -197919,7 +199588,7 @@ sWP sWP sSk jVe -sld +eAO xWg xWg xWg @@ -249091,7 +250760,7 @@ lWr lyK uDA uDA -yli +mgu yli yli yli @@ -249324,7 +250993,7 @@ uDA uDA uDA uDA -uDA +ljz yli yli yli @@ -250332,7 +252001,7 @@ yli yli yli yli -yli +mgu yli yli yli @@ -251370,7 +253039,7 @@ qCg qCg xwM yli -kxS +kyp kxS kxS qCg @@ -251604,7 +253273,7 @@ dTC sTa nVI vMa -wVV +kdO kWT yli yli @@ -251936,7 +253605,7 @@ dvc dvc dvc rxi -ebG +rxi rxi ohC dvc @@ -252941,7 +254610,7 @@ qCg kxS kxS kxS -kxS +kyp yli yli sNi @@ -253694,8 +255363,8 @@ kxS kxS kxS kxS -kxS -kxS +rxi +rxi kxS kxS kxS @@ -253950,11 +255619,11 @@ kxS kxS kxS kxS -kxS -kxS -kxS -kxS -kxS +rxi +rxi +rxi +rxi +rxi kxS kxS kxS @@ -254206,13 +255875,13 @@ yli yli kxS kxS +rxi +rxi kxS +rxi +rxi kxS -kxS -kxS -kxS -kxS -kxS +rxi kxS kxS kxS @@ -254266,7 +255935,7 @@ yli yli yli yli -yli +mgu yli yli yli @@ -254464,14 +256133,14 @@ yli kxS kxS kxS -kxS -kxS +rxi +rxi fzw +rxi +rxi kxS -kxS -kxS -kxS -kxS +rxi +rxi kxS kxS kxS @@ -254720,16 +256389,16 @@ yli yli kxS kxS +rxi kxS -kxS -kxS +rxi cHR -kxS -kxS -kxS -kxS -kxS -kxS +rxi +rxi +rxi +rxi +rxi +rxi kxS kxS kxS @@ -254977,20 +256646,20 @@ yli yli kxS kxS +rxi +rxi +rxi +rxi +rxi +xOo +lzi +ueT +kLl +rxi +rxi kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS +rxi +rxi kxS kxS yli @@ -255008,7 +256677,7 @@ yli yli yli yli -kxS +yli kxS kxS kxS @@ -255235,25 +256904,24 @@ kxS kxS kxS kxS +rxi +rxi +kNb +mUP +sqh +nNY +rxi +wjA +rxi kxS +rxi +rxi +seY +ove +rxi kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli yli yli yli @@ -255264,6 +256932,7 @@ yli yli yli yli +dAb yli yli kxS @@ -255272,7 +256941,7 @@ kxS kxS kxS kxS -dAb +kxS kxS kxS kxS @@ -255491,31 +257160,26 @@ yli kxS kxS kxS +rxi +coy +wjA +gIa +xOo +tMK +rxi +eKt +qwe +rxi +qjr +cwc +rxi +xBv +ggb +rxi +rxi kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli yli yli yli @@ -255525,14 +257189,19 @@ yli yli yli yli +dAb +dAb yli +dAb +kxS +kxS +kxS +kxS +kxS kxS kxS kxS -dAb -dAb kxS -dAb kxS kxS kxS @@ -255748,30 +257417,26 @@ kxS kxS kxS kxS +rxi +coy +nQC +prd +oqm +ial +ial +ial +kFv +vRk +lRf +rxi +rxi +upA +khr +rxi +rxi kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -rKV -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli yli yli yli @@ -255780,11 +257445,6 @@ yli yli yli yli -yli -yli -yli -yli -kxS dAb dAb kiz @@ -255808,6 +257468,15 @@ kxS kxS kxS kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS yli yli yli @@ -256005,35 +257674,26 @@ kxS kxS kxS kxS +rxi +coy +bty +ofC +ial +ial +otu +rxi +axk +vuq +kNb +rxi +rxi +nIC +ggb +rxi +rxi kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli -yli -yli -yli -yli yli yli yli @@ -256057,6 +257717,15 @@ kxS kxS kxS kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS sNi sNi sNi @@ -256261,35 +257930,26 @@ kxS kxS kxS kxS +rxi +rxi +coy +xOo +rxi +rxi +sHG +mon +yeM +gIa +mon +jqW +rxi +rxi +gnb +hJJ +rxi +rxi kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli -yli -yli -yli -yli yli yli yli @@ -256306,6 +257966,15 @@ aoY vcy dAb dAb +yli +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS kxS kxS kxS @@ -256518,35 +258187,26 @@ kxS kxS kxS kxS +rxi +rxi +rxi +wjA +xOo +rxi +fuO +dlw +xOo +xOo +rxi +rxi kxS +rxi kxS +rxi +rxi kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli -yli -yli -yli -yli yli yli yli @@ -256563,6 +258223,15 @@ aoY ykS dAb dAb +yli +yli +yli +yli +kxS +kxS +kxS +kxS +kxS kxS kxS kxS @@ -256757,7 +258426,7 @@ dvc dvc dvc dvc -yli +mgu dvc dvc dvc @@ -256774,35 +258443,26 @@ kxS kxS kxS kxS +rxi kxS +rxi kxS +rxi +rxi +rxi +rxi +rxi +rxi +rxi kxS +rxi kxS +rxi +rxi +rxi kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli -yli -yli -yli -yli yli yli yli @@ -256820,6 +258480,15 @@ aoY msV kiz dAb +yli +yli +yli +yli +yli +yli +yli +kxS +kxS kxS kxS kxS @@ -257031,35 +258700,43 @@ kxS kxS kxS kxS +rxi +rxi +rxi +rxi +rxi +rxi kxS +rxi +rxi kxS +rxi +rxi kxS +rxi +rxi kxS kxS kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli yli yli +wVV yli +wVV yli yli yli yli +dAb +pdW +tfl +fWU +hcP +qRZ +dAb +dAb yli yli yli @@ -257069,14 +258746,6 @@ yli yli yli yli -dAb -pdW -tfl -fWU -hcP -qRZ -dAb -dAb yli yli yli @@ -257288,7 +258957,15 @@ kxS kxS kxS kxS +rxi +rxi +rxi kxS +rxi +rxi +rxi +rxi +rxi kxS kxS kxS @@ -257299,24 +258976,22 @@ kxS kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli -yli -yli -yli yli +oPp +wVV +lWF +evM +wVV +wVV +wVV +wVV yli +dAb +dAb +dAb +dAb +dAb +dAb yli yli yli @@ -257326,12 +259001,6 @@ yli yli yli yli -dAb -dAb -dAb -dAb -dAb -dAb yli yli yli @@ -257546,7 +259215,13 @@ kxS kxS kxS kxS +rxi +rxi +rxi +rxi +rxi kxS +rxi kxS kxS kxS @@ -257558,26 +259233,23 @@ kxS kxS kxS kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -yli -yli -yli yli +wVV +tSC +wVV +tSC yli +tSC +jRA +wVV yli yli yli yli yli +dAb +dAb +dAb yli yli yli @@ -257587,9 +259259,6 @@ yli yli yli yli -dAb -dAb -dAb yli yli yli @@ -257805,10 +259474,10 @@ kxS kxS kxS kxS -kxS -kxS -kxS -kxS +rxi +rxi +rxi +rxi kxS kxS kxS @@ -257821,16 +259490,16 @@ dvc kxS kxS kxS -yli -yli +wVV +lWF bIK -yli -yli -yli -yli -yli -yli -yli +wVV +pTs +lWF +tSC +wVV +evM +wVV yli yli yli @@ -258082,14 +259751,14 @@ yli bIK cnJ kqB -yli -yli -yli -yli -yli -yli -yli -yli +wVV +oPp +evM +lWF +pTs +tSC +wVV +wVV yli yli yli @@ -258341,13 +260010,13 @@ aqa qQo kqB aqa -qJs -yli -yli -yli -yli -yli -yli +wCh +wVV +wVV +wVV +lWF +tSC +wVV yli yli yli @@ -258598,13 +260267,13 @@ kqB kqB nnR cnJ -yli -yli -yli -yli -yli -yli -yli +wVV +tSC +fzx +oPp +wVV +wVV +wVV yli yli yli @@ -258641,7 +260310,7 @@ uDA uDA uDA uDA -fFh +fKS erN mZd bMS @@ -258795,276 +260464,39 @@ qCg qCg sNi sNi -kiZ -bgs -xwM -uDA -uDA -yli -yli -yli -yli -yli -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -yli -yli -yli -yli -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -dvc -dvc -dvc -dvc -dvc -dvc -nrQ -nYL -nYL -sip -qPX -nAF -pbk -tDr -aqa -hYp -ggb -aqa -bHi -bNd -bNd -etN -ocI -ocI -ocI -ocI -kLF -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -sNi -yli -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -kxS -uDA -uDA -uDA -uDA -uDA -hqE -eoS -jmY -sNi -sNi -sNi -qCg -qCg -qCg -qCg -qCg -qCg -qCg -"} -(56,1,4) = {" -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -qCg -sNi -sNi -sNi -yet -csW -gpg +kiZ +bgs +xwM +uDA uDA yli yli yli yli yli -yli +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS +kxS kxS yli +yli +yli +yli +kxS kxS kxS kxS @@ -259072,6 +260504,57 @@ kxS kxS kxS kxS +dvc +dvc +dvc +dvc +dvc +dvc +nrQ +nYL +nYL +sip +qPX +nAF +vmm +tDr +aqa +hYp +ggb +aqa +bHi +bNd +bNd +vTs +kkJ +qsz +mab +kuu +tel +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +yli +sNi +yli +kxS kxS kxS kxS @@ -259080,16 +260563,202 @@ kxS kxS kxS kxS +uDA +uDA +uDA +uDA +uDA +hqE +eoS +jmY +sNi +sNi +sNi +qCg +qCg +qCg +qCg +qCg +qCg +qCg +"} +(56,1,4) = {" +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +qCg +sNi +sNi +sNi +yet +csW +gpg +uDA +yli +yli yli yli yli yli kxS +yli +kxS +kxS +kxS kxS kxS kxS kxS kxS +kxS +kxS +kxS +kxS +wyo +wyo +wyo +wyo +wyo +wyo +wyo +wyo +wyo +wyo +kxS +kxS +kxS dvc dvc dvc @@ -259118,8 +260787,7 @@ gRg sUf ahQ tFV -tZz -yli +hHp yli yli yli @@ -259137,6 +260805,7 @@ yli yli yli yli +aeP yli yli yli @@ -259356,9 +261025,9 @@ nrQ eKj eMx mpI -kmz -ehT -ehT +egg +krW +krW exJ iIy hsh @@ -259375,7 +261044,7 @@ uXr uXr uXr hfW -tZz +hHp yli yli yli @@ -259613,14 +261282,14 @@ gfK wbl hib gHf -frz -frz -frz +exY +exY +exY esO rEg jUk ote -hGc +bRn uwc lDZ kqB @@ -259870,14 +261539,14 @@ sTM rtT dfi nrQ -uNV -pMc -pMc +lzp +lhv +lhv hpx jKs csX pnk -dNK +fnx nBs qKQ ggb @@ -259889,7 +261558,7 @@ uXr uXr uXr cXz -tZz +hHp yli yli yli @@ -260105,14 +261774,14 @@ kxS kxS kxS kxS -kxS -yli -yli -yli -yli -yli -yli -yli +wyo +wyo +wyo +wyo +wyo +wyo +wyo +wyo kxS kxS dvc @@ -260134,7 +261803,7 @@ nYL aRR qnO sqb -bIK +yjV bqg bIK aqa @@ -260391,18 +262060,18 @@ nYL bLn rzL tDr -krV +gRw kqB bIK tae ngJ rqj hxu -gcD -hxu -hxu -hxu +nCU +ktV +jpr hxu +jpr mbE yli yli @@ -260648,7 +262317,7 @@ rOv uNl trd nrQ -cnJ +tqs kqB bqg hfK @@ -260656,11 +262325,11 @@ hYp ayH cnJ bIK -yli -yli -yli -yli -yli +lWF +tSC +wVV +oPp +wVV yli yli yli @@ -260905,19 +262574,19 @@ aXp hsh txR trd -kqX +lsm kqB ggb cnJ wzL bIK -yli -yli -yli -yli -yli -yli -yli +wVV +fzx +tSC +wVV +lWF +evM +wVV yli yli kxS @@ -261162,18 +262831,18 @@ rGM csX cDv nrQ -kqB +sLe bIK nId aqa qJs +tSC +jRA +pTs +tSC yli -yli -yli -yli -yli -yli -yli +lWF +lWF yli yli kxS @@ -261419,20 +263088,20 @@ pbk pbk fxY kAX -jOP +eFW bqg bqg tnT -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS +xwt +lWK +rjx +rjx +rjx +rjx +bpp +rjx +rjx +cPg kxS kxS kxS @@ -261676,20 +263345,20 @@ uVJ uVJ nrQ trd -vWm +tqj hfK ggb +wUU +nQI +lnM +ayH bIK -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS +bIK +sBX +bIK +sBX +mMf +wte kxS kxS uDA @@ -261933,20 +263602,20 @@ xNL xNL apP erO -bqg +bYf hyg cnJ -aqa -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS +vvg +lEc +sol +elM +iad +mTe +sol +vKW +eXD +mMf +hgC kxS kxS uDA @@ -262190,20 +263859,20 @@ apP jsm apP bIK -bIK +yjV hfK bIK -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS +mPv +pdW +sol +xRg +iad +kqB +sol +bkP +yfQ +crm +xAa kxS lHW gpg @@ -262447,20 +264116,20 @@ apP apP dav cnJ -hGN +rpV hyg +wUU +rAu +wQy +sol +xRg +iad bIK -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS +sol +xRg +yfQ +crm +hgC ckI bgs csW @@ -262704,20 +264373,20 @@ alL uDA nnR bqg -ggb +sXm hyg -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS +wqB +fuQ +bIK +sol +auy +iad +kqB +bGP +auy +yfQ +crm +hgC sNi ckI bgs @@ -262733,9 +264402,9 @@ bgs dvc dvc dvc -dvc -dvc -dvc +dGX +dGX +dGX dvc dvc dvc @@ -262961,20 +264630,20 @@ cOC apP cnJ kqB -hGN +rpV wzL -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS +rAu +sBX +bIK +sol +auy +iad +bIK +sol +auy +yfQ +mMf +hgC kxS sNi bMS @@ -262991,21 +264660,21 @@ dvc dvc dvc dvc +dGX +dGX +dGX dvc dvc dvc dvc dvc dvc -dvc -dvc -dvc -kxS kxS kxS kxS kxS kxS +kyp kxS kxS kxS @@ -263218,20 +264887,20 @@ rYt rYt uDA kqB -wAY +ili bIK -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS +lEc +tgt +uXr +sol +xRg +iad +bIK +sol +auy +yfQ +mMf +hgC kxS sNi sNi @@ -263248,9 +264917,9 @@ sNi sNi dvc dvc -dvc -dvc -dvc +dGX +dGX +dGX dvc dvc dvc @@ -263475,20 +265144,20 @@ apP apP wGC aqa -nId +wDD cnJ -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS +rAu +evc +kqB +sol +auy +iad +bIK +sol +bkP +yfQ +bIK +hgC kxS sNi sNi @@ -263507,8 +265176,8 @@ sNi dvc dvc dvc -dvc -dvc +dGX +dGX dvc dvc dvc @@ -263732,20 +265401,20 @@ qMK fCM bIK wGC -bqg +bYf lnM -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli +xzJ +uXr +hoX +uXr +uJN +hfK +ggb +pAy +uJN +bIK +sBX +hgC kxS kxS sNi @@ -263989,20 +265658,20 @@ gpg uDA uDA bIK -bIK -uDA -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS +lwo +ikz +bPr +ocv +pPR +ihG +jIW +bjJ +iXD +vyh +lal +vBh +mMf +hgC kxS kxS sNi @@ -264248,18 +265917,18 @@ cnJ wGC bIK dyt -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS +wLa +eZG +wYG +uXr +trc +lnM +kqB +bIK +wYG +bIK +mMf +hgC kxS kxS sNi @@ -264505,18 +266174,18 @@ uDA wGC gNr uDA -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS -kxS +rAu +qZw +vFz +sol +epm +iad +bIK +sol +mYe +yfQ +crm +hgC kxS sNi sNi @@ -264762,18 +266431,18 @@ apP bIK rzJ kqB -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS -kxS +pRe +qdf +xCK +sol +epm +iad +bIK +sol +uVq +yfQ +mMf +tvj kxS kxS sNi @@ -265019,18 +266688,18 @@ apP uDA hyg wGC -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS -kxS +rAu +xbj +uXr +sol +uVq +iad +kqB +bGP +epm +yfQ +mMf +hgC kxS kxS kxS @@ -265276,18 +266945,18 @@ fkk aQv hfK bqg -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS -kxS +rAu +xXl +pAy +sol +uVq +iad +bIK +sol +epm +yfQ +mMf +hgC kxS kxS kxS @@ -265533,18 +267202,18 @@ bIK xbg kqB duJ -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS -kxS -kxS +pdW +lDM +wQy +sol +adk +iad +bIK +sol +epm +yfQ +mMf +hgC kxS kxS kxS @@ -265561,7 +267230,7 @@ sNi sNi sNi sNi -sNi +hkG sNi sNi sNi @@ -265736,7 +267405,7 @@ sNi yet xwM uDA -kxS +kyp dvc dvc dvc @@ -265791,17 +267460,17 @@ nPk ooY hyg cnJ -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -kxS +nIF +bIK +sol +sna +iad +bIK +sol +eWs +yfQ +bIK +hgC kxS kxS kxS @@ -266048,17 +267717,17 @@ kqB dNK bqg sGy -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli +oRT +cnJ +wQy +sBX +bIK +bIK +sol +aAe +yfQ +kqB +lEc kxS kxS kxS @@ -266305,17 +267974,17 @@ xqm ggb xIQ yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli -yli +pdW +rjx +rjx +bpp +wpX +bIK +cnJ +aqa +bIK +cnJ +nQI yli kxS kxS @@ -266566,13 +268235,13 @@ sBX yli yli yli -yli -yli -yli -yli -yli -yli -yli +pdW +rjx +exf +rjx +rjx +rjx +oDI yli kxS kxS @@ -266590,7 +268259,7 @@ sNi kxS kxS kxS -hqE +pBL lWr eoS jmY @@ -266827,7 +268496,7 @@ yli yli yli yli -yli +qJs yli yli yli @@ -267819,7 +269488,7 @@ sNi sNi yli yli -yli +mgu kxS kxS kxS @@ -269628,7 +271297,7 @@ kxS kxS kxS kxS -kxS +kyp kxS kxS kxS @@ -270880,7 +272549,7 @@ gpg uDA yli yli -yli +mgu yli yli yli @@ -272248,7 +273917,7 @@ yli yli yli yli -yli +mgu yli yli yli @@ -293607,174 +295276,8 @@ rGh rGh rGh rGh -"} -(191,1,4) = {" -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh -rGh +"} +(191,1,4) = {" rGh rGh rGh @@ -293864,8 +295367,6 @@ rGh rGh rGh rGh -"} -(192,1,4) = {" rGh rGh rGh @@ -294032,6 +295533,8 @@ rGh rGh rGh rGh +"} +(192,1,4) = {" rGh rGh rGh @@ -294121,8 +295624,6 @@ rGh rGh rGh rGh -"} -(193,1,4) = {" rGh rGh rGh @@ -294289,6 +295790,8 @@ rGh rGh rGh rGh +"} +(193,1,4) = {" rGh rGh rGh @@ -294378,8 +295881,6 @@ rGh rGh rGh rGh -"} -(194,1,4) = {" rGh rGh rGh @@ -294546,6 +296047,8 @@ rGh rGh rGh rGh +"} +(194,1,4) = {" rGh rGh rGh @@ -294635,8 +296138,6 @@ rGh rGh rGh rGh -"} -(195,1,4) = {" rGh rGh rGh @@ -294803,6 +296304,8 @@ rGh rGh rGh rGh +"} +(195,1,4) = {" rGh rGh rGh @@ -294892,8 +296395,6 @@ rGh rGh rGh rGh -"} -(196,1,4) = {" rGh rGh rGh @@ -295060,6 +296561,8 @@ rGh rGh rGh rGh +"} +(196,1,4) = {" rGh rGh rGh @@ -295149,8 +296652,6 @@ rGh rGh rGh rGh -"} -(197,1,4) = {" rGh rGh rGh @@ -295317,6 +296818,8 @@ rGh rGh rGh rGh +"} +(197,1,4) = {" rGh rGh rGh @@ -295406,8 +296909,6 @@ rGh rGh rGh rGh -"} -(198,1,4) = {" rGh rGh rGh @@ -295574,6 +297075,8 @@ rGh rGh rGh rGh +"} +(198,1,4) = {" rGh rGh rGh @@ -295663,8 +297166,6 @@ rGh rGh rGh rGh -"} -(199,1,4) = {" rGh rGh rGh @@ -295831,6 +297332,8 @@ rGh rGh rGh rGh +"} +(199,1,4) = {" rGh rGh rGh @@ -295920,8 +297423,6 @@ rGh rGh rGh rGh -"} -(200,1,4) = {" rGh rGh rGh @@ -296088,6 +297589,8 @@ rGh rGh rGh rGh +"} +(200,1,4) = {" rGh rGh rGh @@ -296177,8 +297680,6 @@ rGh rGh rGh rGh -"} -(201,1,4) = {" rGh rGh rGh @@ -296345,6 +297846,8 @@ rGh rGh rGh rGh +"} +(201,1,4) = {" rGh rGh rGh @@ -296434,8 +297937,6 @@ rGh rGh rGh rGh -"} -(202,1,4) = {" rGh rGh rGh @@ -296602,6 +298103,8 @@ rGh rGh rGh rGh +"} +(202,1,4) = {" rGh rGh rGh @@ -296691,8 +298194,6 @@ rGh rGh rGh rGh -"} -(203,1,4) = {" rGh rGh rGh @@ -296859,6 +298360,8 @@ rGh rGh rGh rGh +"} +(203,1,4) = {" rGh rGh rGh @@ -296948,8 +298451,6 @@ rGh rGh rGh rGh -"} -(204,1,4) = {" rGh rGh rGh @@ -297116,6 +298617,8 @@ rGh rGh rGh rGh +"} +(204,1,4) = {" rGh rGh rGh @@ -297205,8 +298708,6 @@ rGh rGh rGh rGh -"} -(205,1,4) = {" rGh rGh rGh @@ -297373,6 +298874,8 @@ rGh rGh rGh rGh +"} +(205,1,4) = {" rGh rGh rGh @@ -297462,8 +298965,6 @@ rGh rGh rGh rGh -"} -(206,1,4) = {" rGh rGh rGh @@ -297630,6 +299131,8 @@ rGh rGh rGh rGh +"} +(206,1,4) = {" rGh rGh rGh @@ -297719,8 +299222,6 @@ rGh rGh rGh rGh -"} -(207,1,4) = {" rGh rGh rGh @@ -297887,6 +299388,8 @@ rGh rGh rGh rGh +"} +(207,1,4) = {" rGh rGh rGh @@ -297976,8 +299479,6 @@ rGh rGh rGh rGh -"} -(208,1,4) = {" rGh rGh rGh @@ -298144,6 +299645,8 @@ rGh rGh rGh rGh +"} +(208,1,4) = {" rGh rGh rGh @@ -298233,8 +299736,6 @@ rGh rGh rGh rGh -"} -(209,1,4) = {" rGh rGh rGh @@ -298401,6 +299902,8 @@ rGh rGh rGh rGh +"} +(209,1,4) = {" rGh rGh rGh @@ -298490,8 +299993,6 @@ rGh rGh rGh rGh -"} -(210,1,4) = {" rGh rGh rGh @@ -298658,6 +300159,8 @@ rGh rGh rGh rGh +"} +(210,1,4) = {" rGh rGh rGh @@ -298747,8 +300250,6 @@ rGh rGh rGh rGh -"} -(211,1,4) = {" rGh rGh rGh @@ -298915,6 +300416,8 @@ rGh rGh rGh rGh +"} +(211,1,4) = {" rGh rGh rGh @@ -299004,8 +300507,6 @@ rGh rGh rGh rGh -"} -(212,1,4) = {" rGh rGh rGh @@ -299172,6 +300673,8 @@ rGh rGh rGh rGh +"} +(212,1,4) = {" rGh rGh rGh @@ -299206,6 +300709,13 @@ rGh rGh rGh rGh +how +how +how +how +how +how +how rGh rGh rGh @@ -299261,8 +300771,6 @@ rGh rGh rGh rGh -"} -(213,1,4) = {" rGh rGh rGh @@ -299422,6 +300930,8 @@ rGh rGh rGh rGh +"} +(213,1,4) = {" rGh rGh rGh @@ -299456,6 +300966,13 @@ rGh rGh rGh rGh +how +how +how +how +how +how +how rGh rGh rGh @@ -299518,8 +301035,6 @@ rGh rGh rGh rGh -"} -(214,1,4) = {" rGh rGh rGh @@ -299672,6 +301187,8 @@ rGh rGh rGh rGh +"} +(214,1,4) = {" rGh rGh rGh @@ -299709,6 +301226,10 @@ rGh rGh rGh rGh +how +how +how +how rGh rGh rGh @@ -299775,8 +301296,6 @@ rGh rGh rGh rGh -"} -(215,1,4) = {" rGh rGh rGh @@ -299925,6 +301444,8 @@ rGh rGh rGh rGh +"} +(215,1,4) = {" rGh rGh rGh @@ -299961,6 +301482,11 @@ rGh rGh rGh rGh +how +how +how +how +how rGh rGh rGh @@ -300032,8 +301558,6 @@ rGh rGh rGh rGh -"} -(216,1,4) = {" rGh rGh rGh @@ -300177,6 +301701,8 @@ rGh rGh rGh rGh +"} +(216,1,4) = {" rGh rGh rGh @@ -300212,7 +301738,12 @@ rGh rGh rGh rGh +how +how +how rGh +how +how rGh rGh rGh @@ -300289,8 +301820,6 @@ rGh rGh rGh rGh -"} -(217,1,4) = {" rGh rGh rGh @@ -300429,6 +301958,8 @@ rGh rGh rGh rGh +"} +(217,1,4) = {" rGh rGh rGh @@ -300463,8 +301994,13 @@ rGh rGh rGh rGh +how +how +how rGh rGh +how +how rGh rGh rGh @@ -300546,8 +302082,6 @@ rGh rGh rGh rGh -"} -(218,1,4) = {" rGh rGh rGh @@ -300681,6 +302215,8 @@ rGh rGh rGh rGh +"} +(218,1,4) = {" rGh rGh rGh @@ -300714,9 +302250,14 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh +how +how rGh rGh rGh @@ -300803,8 +302344,6 @@ rGh rGh rGh rGh -"} -(219,1,4) = {" rGh rGh rGh @@ -300933,6 +302472,8 @@ rGh rGh rGh rGh +"} +(219,1,4) = {" rGh rGh rGh @@ -300965,6 +302506,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -301060,8 +302604,6 @@ rGh rGh rGh rGh -"} -(220,1,4) = {" rGh rGh rGh @@ -301187,6 +302729,8 @@ rGh rGh rGh rGh +"} +(220,1,4) = {" rGh rGh rGh @@ -301218,6 +302762,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -301317,8 +302864,6 @@ rGh rGh rGh rGh -"} -(221,1,4) = {" rGh rGh rGh @@ -301441,6 +302986,8 @@ rGh rGh rGh rGh +"} +(221,1,4) = {" rGh rGh rGh @@ -301471,6 +303018,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -301574,8 +303124,6 @@ rGh rGh rGh rGh -"} -(222,1,4) = {" rGh rGh rGh @@ -301695,6 +303243,8 @@ rGh rGh rGh rGh +"} +(222,1,4) = {" rGh rGh rGh @@ -301724,6 +303274,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -301831,8 +303384,6 @@ rGh rGh rGh rGh -"} -(223,1,4) = {" rGh rGh rGh @@ -301949,6 +303500,8 @@ rGh rGh rGh rGh +"} +(223,1,4) = {" rGh rGh rGh @@ -301977,6 +303530,10 @@ rGh rGh rGh rGh +how +how +how +rGh rGh rGh rGh @@ -302088,8 +303645,6 @@ rGh rGh rGh rGh -"} -(224,1,4) = {" rGh rGh rGh @@ -302202,6 +303757,8 @@ rGh rGh rGh rGh +"} +(224,1,4) = {" rGh rGh rGh @@ -302229,6 +303786,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -302345,8 +303905,6 @@ rGh rGh rGh rGh -"} -(225,1,4) = {" rGh rGh rGh @@ -302456,6 +304014,8 @@ rGh rGh rGh rGh +"} +(225,1,4) = {" rGh rGh rGh @@ -302482,6 +304042,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -302602,8 +304165,6 @@ rGh rGh rGh rGh -"} -(226,1,4) = {" rGh rGh rGh @@ -302710,6 +304271,8 @@ rGh rGh rGh rGh +"} +(226,1,4) = {" rGh rGh rGh @@ -302735,6 +304298,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -302859,8 +304425,6 @@ rGh rGh rGh rGh -"} -(227,1,4) = {" rGh rGh rGh @@ -302964,6 +304528,8 @@ rGh rGh rGh rGh +"} +(227,1,4) = {" rGh rGh rGh @@ -302988,6 +304554,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -303116,8 +304685,6 @@ rGh rGh rGh rGh -"} -(228,1,4) = {" rGh rGh rGh @@ -303218,6 +304785,8 @@ rGh rGh rGh rGh +"} +(228,1,4) = {" rGh rGh rGh @@ -303241,6 +304810,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -303373,8 +304945,6 @@ rGh rGh rGh rGh -"} -(229,1,4) = {" rGh rGh rGh @@ -303472,6 +305042,8 @@ rGh rGh rGh rGh +"} +(229,1,4) = {" rGh rGh rGh @@ -303494,6 +305066,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -303630,8 +305205,6 @@ rGh rGh rGh rGh -"} -(230,1,4) = {" rGh rGh rGh @@ -303726,6 +305299,8 @@ rGh rGh rGh rGh +"} +(230,1,4) = {" rGh rGh rGh @@ -303747,6 +305322,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -303887,8 +305465,6 @@ rGh rGh rGh rGh -"} -(231,1,4) = {" rGh rGh rGh @@ -303980,6 +305556,8 @@ rGh rGh rGh rGh +"} +(231,1,4) = {" rGh rGh rGh @@ -304000,6 +305578,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -304144,8 +305725,6 @@ rGh rGh rGh rGh -"} -(232,1,4) = {" rGh rGh rGh @@ -304234,6 +305813,8 @@ rGh rGh rGh rGh +"} +(232,1,4) = {" rGh rGh rGh @@ -304253,6 +305834,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -304401,8 +305985,6 @@ rGh rGh rGh rGh -"} -(233,1,4) = {" rGh rGh rGh @@ -304488,6 +306070,8 @@ rGh rGh rGh rGh +"} +(233,1,4) = {" rGh rGh rGh @@ -304506,6 +306090,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -304658,8 +306245,6 @@ rGh rGh rGh rGh -"} -(234,1,4) = {" rGh rGh rGh @@ -304742,6 +306327,8 @@ rGh rGh rGh rGh +"} +(234,1,4) = {" rGh rGh rGh @@ -304759,6 +306346,9 @@ rGh rGh rGh rGh +how +how +how rGh rGh rGh @@ -304915,8 +306505,6 @@ rGh rGh rGh rGh -"} -(235,1,4) = {" rGh rGh rGh @@ -304996,6 +306584,8 @@ rGh rGh rGh rGh +"} +(235,1,4) = {" rGh rGh rGh @@ -305012,6 +306602,21 @@ rGh rGh rGh rGh +how +how +how +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh rGh rGh rGh @@ -305172,8 +306777,6 @@ rGh rGh rGh rGh -"} -(236,1,4) = {" rGh rGh rGh @@ -305238,6 +306841,72 @@ rGh rGh rGh rGh +"} +(236,1,4) = {" +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +how +how +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh +rGh rGh rGh rGh diff --git a/_maps/shuttles/exploration/exploration_shuttle.dmm b/_maps/shuttles/exploration/exploration_shuttle.dmm index c2e4fd1e84e45..b67dca8a646f0 100644 --- a/_maps/shuttles/exploration/exploration_shuttle.dmm +++ b/_maps/shuttles/exploration/exploration_shuttle.dmm @@ -258,13 +258,11 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/exploration) "F" = ( -/obj/machinery/camera/preset{ - dir = 6 - }, /obj/machinery/newscaster{ pixel_x = 32; pixel_y = 1 }, +/obj/machinery/camera/autoname/directional/east, /turf/open/floor/mineral/titanium, /area/shuttle/exploration) "G" = ( diff --git a/beestation.dme b/beestation.dme index 40af48f8f1503..cd9e1b7ded241 100644 --- a/beestation.dme +++ b/beestation.dme @@ -250,6 +250,7 @@ #include "code\__HELPERS\chat.dm" #include "code\__HELPERS\cmp.dm" #include "code\__HELPERS\colors.dm" +#include "code\__HELPERS\construction.dm" #include "code\__HELPERS\dates.dm" #include "code\__HELPERS\datums.dm" #include "code\__HELPERS\debug_procs.dm" @@ -825,6 +826,7 @@ #include "code\datums\elements\light_blocking.dm" #include "code\datums\elements\mechanical_repair.dm" #include "code\datums\elements\mirage_border.dm" +#include "code\datums\elements\movetype_handler.dm" #include "code\datums\elements\obj_regen.dm" #include "code\datums\elements\openspace_item_click_handler.dm" #include "code\datums\elements\pet_bonus.dm" diff --git a/code/__DEFINES/construction.dm b/code/__DEFINES/construction.dm index f18fbd97c9635..afca149e46d0d 100644 --- a/code/__DEFINES/construction.dm +++ b/code/__DEFINES/construction.dm @@ -108,25 +108,33 @@ #define CAT_STRUCTURE "Structures" -// rcd buildtype defines -// these aren't even used as bitflags so who even knows why they are treated like them -#define RCD_FLOORWALL (1<<0) -#define RCD_AIRLOCK (1<<1) -#define RCD_DECONSTRUCT (1<<2) -#define RCD_WINDOWGRILLE (1<<3) -#define RCD_MACHINE (1<<4) -#define RCD_COMPUTER (1<<5) -#define RCD_FURNISHING (1<<6) -#define RCD_LADDER (1<<7) - -#define RCD_UPGRADE_FRAMES (1<<0) -#define RCD_UPGRADE_SIMPLE_CIRCUITS (1<<1) -#define RCD_UPGRADE_SILO_LINK (1<<2) -#define RCD_UPGRADE_FURNISHING (1<<3) +//rcd modes +#define RCD_FLOORWALL 0 +#define RCD_AIRLOCK 1 +#define RCD_DECONSTRUCT 2 +#define RCD_WINDOWGRILLE 3 +#define RCD_MACHINE 4 +#define RCD_COMPUTER 5 +#define RCD_FURNISHING 6 +#define RCD_LADDER 7 + +#define RCD_UPGRADE_FRAMES 0 +#define RCD_UPGRADE_SIMPLE_CIRCUITS 1 +#define RCD_UPGRADE_SILO_LINK 2 +#define RCD_UPGRADE_FURNISHING 3 + +#define RPD_UPGRADE_UNWRENCH 0 #define RCD_WINDOW_FULLTILE "full tile" #define RCD_WINDOW_DIRECTIONAL "directional" #define RCD_WINDOW_NORMAL "glass" #define RCD_WINDOW_REINFORCED "reinforced glass" -#define RPD_UPGRADE_UNWRENCH (1<<0) +#define RCD_MEMORY_WALL 1 +#define RCD_MEMORY_WINDOWGRILLE 2 + +// How much faster to use the RCD when on a tile with memory +#define RCD_MEMORY_SPEED_BUFF 5 + +/// How much less resources the RCD uses when reconstructing +#define RCD_MEMORY_COST_BUFF 8 diff --git a/code/__DEFINES/dcs/signals/signals_movable.dm b/code/__DEFINES/dcs/signals/signals_movable.dm index 077ef19d0b78d..f89b79dad4d27 100644 --- a/code/__DEFINES/dcs/signals/signals_movable.dm +++ b/code/__DEFINES/dcs/signals/signals_movable.dm @@ -63,3 +63,12 @@ #define COMSIG_STORAGE_ENTERED "storage_entered" ///from base of atom/movable/on_exit_storage(): (datum/component/storage/concrete/master_storage) #define COMSIG_STORAGE_EXITED "storage_exited" + +// /datum/element/movetype_handler signals +/// Called when the floating anim has to be temporarily stopped and restarted later: (timer) +#define COMSIG_PAUSE_FLOATING_ANIM "pause_floating_anim" +/// From base of datum/element/movetype_handler/on_movement_type_trait_gain: (flag) +#define COMSIG_MOVETYPE_FLAG_ENABLED "movetype_flag_enabled" +/// From base of datum/element/movetype_handler/on_movement_type_trait_loss: (flag) +#define COMSIG_MOVETYPE_FLAG_DISABLED "movetype_flag_disabled" + diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index 5f17209e041d1..d207836b91066 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -523,3 +523,20 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai /// Trait for psyphoza, flag for examine logic #define TRAIT_PSYCHIC_SENSE "psychic_sense" + +///Movement type traits for movables. See elements/movetype_handler.dm +#define TRAIT_MOVE_GROUND "move_ground" +#define TRAIT_MOVE_FLYING "move_flying" +#define TRAIT_MOVE_VENTCRAWLING "move_ventcrawling" +#define TRAIT_MOVE_FLOATING "move_floating" +#define TRAIT_MOVE_PHASING "move_phasing" +/// Disables the floating animation. See above. +#define TRAIT_NO_FLOATING_ANIM "no-floating-animation" +/// Trait given to an atom/movable when they orbit something. +#define ORBITING_TRAIT "orbiting" + +#define VENTCRAWLING_TRAIT "ventcrawling" +#define SPECIES_FLIGHT_TRAIT "species-flight" +#define NO_GRAVITY_TRAIT "no-gravity" +#define LIFECANDLE_TRAIT "lifecandle" +#define LEAPER_BUBBLE_TRAIT "leaper-bubble" diff --git a/code/__HELPERS/construction.dm b/code/__HELPERS/construction.dm new file mode 100644 index 0000000000000..ad9f24cef3c17 --- /dev/null +++ b/code/__HELPERS/construction.dm @@ -0,0 +1,10 @@ +/// Produces a new RCD result from the given one if it can be calculated that +/// the RCD should speed up with the remembered form. +/proc/rcd_result_with_memory(list/defaults, turf/place, expected_memory) + if (place?.rcd_memory == expected_memory) + return defaults + list( + "cost" = defaults["cost"] / RCD_MEMORY_COST_BUFF, + "delay" = defaults["delay"] / RCD_MEMORY_SPEED_BUFF, + ) + else + return defaults diff --git a/code/__HELPERS/icons.dm b/code/__HELPERS/icons.dm index d6a4b15c867f7..f6473d991c524 100644 --- a/code/__HELPERS/icons.dm +++ b/code/__HELPERS/icons.dm @@ -1004,10 +1004,10 @@ world I.pixel_y++ add_overlay(I)//And finally add the overlay. -/proc/getHologramIcon(icon/A, safety=1)//If safety is on, a new icon is not created. +/proc/getHologramIcon(icon/A, safety = TRUE, opacity = 0.5)//If safety is on, a new icon is not created. var/icon/flat_icon = safety ? A : new(A)//Has to be a new icon to not constantly change the same icon. flat_icon.ColorTone(rgb(125,180,225))//Let's make it bluish. - flat_icon.ChangeOpacity(0.5)//Make it half transparent. + flat_icon.ChangeOpacity(opacity) var/icon/alpha_mask = new('icons/effects/effects.dmi', "scanline")//Scanline effect. flat_icon.AddAlphaMask(alpha_mask)//Finally, let's mix in a distortion effect. return flat_icon diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index de8e170d4db26..bd77f0b85bb23 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -139,6 +139,13 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_DOOR_PRYER" = TRAIT_DOOR_PRYER, "TRAIT_FISH_SAFE_STORAGE" = TRAIT_FISH_SAFE_STORAGE, "TRAIT_FISH_CASE_COMPATIBILE" = TRAIT_FISH_CASE_COMPATIBILE + ), + /atom/movable = list( + "TRAIT_MOVE_GROUND" = TRAIT_MOVE_GROUND, + "TRAIT_MOVE_FLYING" = TRAIT_MOVE_FLYING, + "TRAIT_MOVE_VENTCRAWLING" = TRAIT_MOVE_VENTCRAWLING, + "TRAIT_MOVE_FLOATING" = TRAIT_MOVE_FLOATING, + "TRAIT_MOVE_PHASING" = TRAIT_MOVE_PHASING ) )) @@ -151,3 +158,25 @@ GLOBAL_LIST(trait_name_map) for(var/tname in GLOB.traits_by_type[key]) var/val = GLOB.traits_by_type[key][tname] .[val] = tname + + +GLOBAL_LIST_INIT(movement_type_trait_to_flag, list( + TRAIT_MOVE_GROUND = GROUND, + TRAIT_MOVE_FLYING = FLYING, + TRAIT_MOVE_VENTCRAWLING = VENTCRAWLING, + TRAIT_MOVE_FLOATING = FLOATING, + TRAIT_MOVE_PHASING = PHASING + )) + +GLOBAL_LIST_INIT(movement_type_addtrait_signals, set_movement_type_addtrait_signals()) +GLOBAL_LIST_INIT(movement_type_removetrait_signals, set_movement_type_removetrait_signals()) + +/proc/set_movement_type_addtrait_signals(signal_prefix) + . = list() + for(var/trait in GLOB.movement_type_trait_to_flag) + . += SIGNAL_ADDTRAIT(trait) + +/proc/set_movement_type_removetrait_signals(signal_prefix) + . = list() + for(var/trait in GLOB.movement_type_trait_to_flag) + . += SIGNAL_REMOVETRAIT(trait) diff --git a/code/datums/components/caltrop.dm b/code/datums/components/caltrop.dm index 4c0b708a0be17..b884e4ab248b9 100644 --- a/code/datums/components/caltrop.dm +++ b/code/datums/components/caltrop.dm @@ -55,7 +55,7 @@ if(!(flags & CALTROP_BYPASS_SHOES) && (H.shoes || feetCover)) return - if((H.movement_type & FLYING) || (H.body_position == LYING_DOWN)|| H.buckled) + if((H.movement_type & (FLYING|FLOATING)) || (H.body_position == LYING_DOWN)|| H.buckled) return var/damage = rand(min_damage, max_damage) diff --git a/code/datums/components/chasm.dm b/code/datums/components/chasm.dm index 2838e70c19450..c439bcee66ce0 100644 --- a/code/datums/components/chasm.dm +++ b/code/datums/components/chasm.dm @@ -69,7 +69,7 @@ return FALSE if(!isliving(AM) && !isobj(AM)) return FALSE - if(is_type_in_typecache(AM, forbidden_types) || AM.throwing || (AM.movement_type & FLOATING)) + if(is_type_in_typecache(AM, forbidden_types) || AM.throwing || (AM.movement_type & (FLOATING|FLYING))) return FALSE //Flies right over the chasm if(ismob(AM)) @@ -78,8 +78,6 @@ var/mob/buckled_to = M.buckled if((!ismob(M.buckled) || (buckled_to.buckled != M)) && !droppable(M.buckled)) return FALSE - if(M.is_flying()) - return FALSE if(ishuman(AM)) var/mob/living/carbon/human/H = AM if(istype(H.belt, /obj/item/wormhole_jaunter)) @@ -116,19 +114,25 @@ if (isliving(AM)) var/mob/living/L = AM L.notransform = TRUE - L.Paralyze(20 SECONDS) + L.Paralyze(2 SECONDS) + + if(ismecha(AM)) + var/obj/vehicle/sealed/mecha/mech = AM + mech.canmove = FALSE var/oldtransform = AM.transform var/oldcolor = AM.color var/oldalpha = AM.alpha - animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 10) + animate(AM, transform = matrix() - matrix(), alpha = 0, color = rgb(0, 0, 0), time = 15) for(var/i in 1 to 5) //Make sure the item is still there after our sleep if(!AM || QDELETED(AM)) return AM.pixel_y-- - sleep(2) - + sleep(3) + if(i == 2 && ismecha(AM)) + var/obj/vehicle/sealed/mecha/mech = AM + mech.Eject() //ABORT ABORT //Make sure the item is still there after our sleep if(!AM || QDELETED(AM)) return diff --git a/code/datums/components/orbiter.dm b/code/datums/components/orbiter.dm index 8186365f5cd89..3db152283651f 100644 --- a/code/datums/components/orbiter.dm +++ b/code/datums/components/orbiter.dm @@ -65,6 +65,7 @@ orbiter.orbiting.end_orbit(orbiter) current_orbiters[orbiter] = TRUE orbiter.orbiting = src + ADD_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT) RegisterSignal(orbiter, COMSIG_MOVABLE_MOVED, PROC_REF(orbiter_move_react)) SEND_SIGNAL(parent, COMSIG_ATOM_ORBIT_BEGIN, orbiter) var/matrix/initial_transform = matrix(orbiter.transform) @@ -99,6 +100,7 @@ current_orbiters -= orbiter orbiter.stop_orbit(src) orbiter.orbiting = null + REMOVE_TRAIT(orbiter, TRAIT_NO_FLOATING_ANIM, ORBITING_TRAIT) if(!refreshing && !length(current_orbiters) && !QDELING(src)) qdel(src) diff --git a/code/datums/elements/movetype_handler.dm b/code/datums/elements/movetype_handler.dm new file mode 100644 index 0000000000000..4447d1638bcf6 --- /dev/null +++ b/code/datums/elements/movetype_handler.dm @@ -0,0 +1,107 @@ +/** + * An element that enables and disables movetype bitflags as movetype traits are added and removed. + * It also handles the +2/-2 pixel y anim loop typical of mobs possessing the FLYING or FLOATING movetypes. + * This element is necessary for the TRAIT_MOVE_ traits to work correctly. So make sure to include it when + * manipulating those traits on non-living movables. + */ +/datum/element/movetype_handler + element_flags = ELEMENT_DETACH + + var/list/attached_atoms = list() + var/list/paused_floating_anim_atoms = list() + +/datum/element/movetype_handler/Attach(datum/target) + . = ..() + if(!ismovable(target)) + return ELEMENT_INCOMPATIBLE + if(attached_atoms[target]) //Already attached. + return + + var/atom/movable/movable_target = target + RegisterSignals(movable_target, GLOB.movement_type_addtrait_signals, PROC_REF(on_movement_type_trait_gain)) + RegisterSignals(movable_target, GLOB.movement_type_removetrait_signals, PROC_REF(on_movement_type_trait_loss)) + RegisterSignal(movable_target, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_gain)) + RegisterSignal(movable_target, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM), PROC_REF(on_no_floating_anim_trait_loss)) + RegisterSignal(movable_target, COMSIG_PAUSE_FLOATING_ANIM, PROC_REF(pause_floating_anim)) + attached_atoms[movable_target] = TRUE + + if(movable_target.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(movable_target, TRAIT_NO_FLOATING_ANIM)) + float(movable_target) + +/datum/element/movetype_handler/Detach(datum/source) + UnregisterSignal(source, GLOB.movement_type_addtrait_signals) + UnregisterSignal(source, GLOB.movement_type_removetrait_signals) + UnregisterSignal(source, SIGNAL_ADDTRAIT(TRAIT_NO_FLOATING_ANIM)) + UnregisterSignal(source, SIGNAL_REMOVETRAIT(TRAIT_NO_FLOATING_ANIM)) + UnregisterSignal(source, COMSIG_PAUSE_FLOATING_ANIM) + attached_atoms -= source + paused_floating_anim_atoms -= source + stop_floating(source) + return ..() + +/// Called when a movement type trait is added to the movable. Enables the relative bitflag. +/datum/element/movetype_handler/proc/on_movement_type_trait_gain(atom/movable/source, trait) + SIGNAL_HANDLER + var/flag = GLOB.movement_type_trait_to_flag[trait] + if(source.movement_type & flag) + return + if(!(source.movement_type & (FLOATING|FLYING)) && (trait == TRAIT_MOVE_FLYING || trait == TRAIT_MOVE_FLOATING) && !paused_floating_anim_atoms[source] && !HAS_TRAIT(source, TRAIT_NO_FLOATING_ANIM)) + float(source) + source.movement_type |= flag + SEND_SIGNAL(source, COMSIG_MOVETYPE_FLAG_ENABLED, flag) + +/// Called when a movement type trait is removed from the movable. Disables the relative bitflag if it wasn't there in the compile-time bitfield. +/datum/element/movetype_handler/proc/on_movement_type_trait_loss(atom/movable/source, trait) + SIGNAL_HANDLER + var/flag = GLOB.movement_type_trait_to_flag[trait] + if(initial(source.movement_type) & flag) + return + source.movement_type &= ~flag + if((trait == TRAIT_MOVE_FLYING || trait == TRAIT_MOVE_FLOATING) && !(source.movement_type & (FLOATING|FLYING))) + stop_floating(source) + SEND_SIGNAL(source, COMSIG_MOVETYPE_FLAG_DISABLED, flag) + +/// Called when the TRAIT_NO_FLOATING_ANIM trait is added to the movable. Stops it from bobbing up and down. +/datum/element/movetype_handler/proc/on_no_floating_anim_trait_gain(atom/movable/source, trait) + SIGNAL_HANDLER + stop_floating(source) + +/// Called when the TRAIT_NO_FLOATING_ANIM trait is removed from the mob. Restarts the bobbing animation. +/datum/element/movetype_handler/proc/on_no_floating_anim_trait_loss(atom/movable/source, trait) + SIGNAL_HANDLER + if(source.movement_type & (FLOATING|FLYING) && !paused_floating_anim_atoms[source]) + float(source) + +///Pauses the floating animation for the duration of the timer... plus [tickrate - (world.time + timer) % tickrate] to be precise. +/datum/element/movetype_handler/proc/pause_floating_anim(atom/movable/source, timer) + SIGNAL_HANDLER + if(paused_floating_anim_atoms[source] < world.time + timer) + stop_floating(source) + if(!length(paused_floating_anim_atoms)) + START_PROCESSING(SSdcs, src) //1 second tickrate. + paused_floating_anim_atoms[source] = world.time + timer + +/datum/element/movetype_handler/process() + for(var/_paused in paused_floating_anim_atoms) + var/atom/movable/paused = _paused + if(!paused) + paused_floating_anim_atoms -= paused + else if(paused_floating_anim_atoms[paused] < world.time) + if(paused.movement_type & (FLOATING|FLYING) && !HAS_TRAIT(paused, TRAIT_NO_FLOATING_ANIM)) + float(paused) + paused_floating_anim_atoms -= paused + if(!length(paused_floating_anim_atoms)) + STOP_PROCESSING(SSdcs, src) + +///Floats the movable up and down. Not a comsig proc. +/datum/element/movetype_handler/proc/float(atom/movable/target) + animate(target, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) + animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) + +/// Stops the above. Also not a comsig proc. +/datum/element/movetype_handler/proc/stop_floating(atom/movable/target) + var/final_pixel_y = target.base_pixel_y + if(isliving(target)) //Living mobs also have a 'body_position_pixel_y_offset' variable that has to be taken into account here. + var/mob/living/living_target = target + final_pixel_y += living_target.body_position_pixel_y_offset + animate(target, pixel_y = final_pixel_y, time = 1 SECONDS) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 0f8136b8c2a77..20e5b0d19fad2 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -38,8 +38,13 @@ var/datum/movement_packet/move_packet var/list/acted_explosions //for explosion dodging var/datum/forced_movement/force_moving = null //handled soley by forced_movement.dm - ///In case you have multiple types, you automatically use the most useful one. IE: Skating on ice, flippers on water, flying over chasm/space, etc. Should only be changed through setMovetype() + /** + * In case you have multiple types, you automatically use the most useful one. + * IE: Skating on ice, flippers on water, flying over chasm/space, etc. + * I reccomend you use the movetype_handler system and not modify this directly, especially for living mobs. + */ var/movement_type = GROUND + var/atom/movable/pulling var/grab_state = 0 var/throwforce = 0 @@ -665,14 +670,6 @@ Moved(oldloc, NONE, TRUE) -///Proc to modify the movement_type and hook behavior associated with it changing. -/atom/movable/proc/setMovetype(newval) - if(movement_type == newval) - return - . = movement_type - movement_type = newval - - //Called whenever an object moves and by mobs when they attempt to move themselves through space //And when an object or action applies a force on src, see newtonian_move() below //Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting @@ -911,8 +908,8 @@ var/matrix/initial_transform = matrix(transform) var/matrix/rotated_transform = transform.Turn(rand(13,17) * turn_dir) - animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, transform=rotated_transform, time = 1, easing=BACK_EASING|EASE_IN) - animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, transform=initial_transform, time = 2, easing=SINE_EASING) + animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, transform=rotated_transform, time = 1, easing=BACK_EASING|EASE_IN, flags = ANIMATION_PARALLEL) + animate(pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, transform=initial_transform, time = 2, easing=SINE_EASING, flags = ANIMATION_PARALLEL) /atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item) var/image/I @@ -1011,17 +1008,6 @@ acted_explosions += ex_id return TRUE -//TODO: Better floating -/atom/movable/proc/float(on) - if(throwing) - return - if(on && !(movement_type & FLOATING)) - animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) - animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) - setMovetype(movement_type | FLOATING) - else if (!on && (movement_type & FLOATING)) - animate(src, pixel_y = base_pixel_y, time = 10) - setMovetype(movement_type & ~FLOATING) /* Language procs * Unless you are doing something very specific, these are the ones you want to use. */ diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index e47cf5326b72c..79698040fb0f7 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -165,7 +165,7 @@ var/icon/I = icon(icon, icon_state, dir) holder.pixel_y = I.Height() - world.icon_size else - stack_trace("[src] does not have a HEALTH_HUD but updates it!") + CRASH("[src] does not have a HEALTH_HUD but updates it!") //for carbon suit sensors /mob/living/carbon/med_hud_set_health() @@ -183,7 +183,7 @@ else holder.icon_state = "hudhealthy" else - stack_trace("[src] does not have a HEALTH_HUD but updates it!") + CRASH("[src] does not have a HEALTH_HUD but updates it!") /mob/living/carbon/med_hud_set_status() var/image/holder = hud_list[STATUS_HUD] @@ -234,7 +234,7 @@ if(null) holder.icon_state = "hudhealthy" else - stack_trace("[src] does not have a HEALTH_HUD but updates it!") + CRASH("[src] does not have a HEALTH_HUD but updates it!") /*********************************************** diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 7e6497177ac85..eea51ee705002 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -360,7 +360,7 @@ Class Procs: /obj/machinery/can_interact(mob/user) var/silicon = issilicon(user) var/admin_ghost = IsAdminGhost(user) - var/living = isliving(user) + var/living = ishuman(user) // /mob/living/carbon/HUMANS, not /mob/living. if((machine_stat & (NOPOWER|BROKEN)) && !(interaction_flags_machine & INTERACT_MACHINE_OFFLINE)) // Check if the machine is broken, and if we can still interact with it if so return FALSE diff --git a/code/game/objects/buckling.dm b/code/game/objects/buckling.dm index 72188002f4287..5d74559440cfd 100644 --- a/code/game/objects/buckling.dm +++ b/code/game/objects/buckling.dm @@ -108,6 +108,10 @@ if (!check_loc && M.loc != loc) M.forceMove(loc) + if(anchored) + ADD_TRAIT(M, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT) + if(!length(buckled_mobs)) + RegisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored)) M.set_buckled(src) M.setDir(dir) buckled_mobs |= M @@ -153,10 +157,25 @@ buckled_mob.clear_alert("buckled") //buckled_mob.set_glide_size(DELAY_TO_GLIDE_SIZE(buckled_mob.total_multiplicative_slowdown())) buckled_mobs -= buckled_mob + if(anchored) + REMOVE_TRAIT(buckled_mob, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT) + if(!length(buckled_mobs)) + UnregisterSignal(src, COMSIG_MOVABLE_SET_ANCHORED, PROC_REF(on_set_anchored)) SEND_SIGNAL(src, COMSIG_MOVABLE_UNBUCKLE, buckled_mob, force) post_unbuckle_mob(.) +/atom/movable/proc/on_set_anchored(atom/movable/source, anchorvalue) + SIGNAL_HANDLER + for(var/_buckled_mob in buckled_mobs) + if(!_buckled_mob) + continue + var/mob/living/buckled_mob = _buckled_mob + if(anchored) + ADD_TRAIT(buckled_mob, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT) + else + REMOVE_TRAIT(buckled_mob, TRAIT_NO_FLOATING_ANIM, BUCKLED_TRAIT) + /atom/movable/proc/unbuckle_all_mobs(force=FALSE) if(!has_buckled_mobs()) diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index dff208fc90471..6031d3bab396d 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -344,6 +344,10 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) name = "carpspawn" icon_state = "carp_spawn" +/obj/effect/landmark/loneops + name = "lone ops" + icon_state = "lone_ops" + //observer start /obj/effect/landmark/observer_start name = "Observer-Start" diff --git a/code/game/objects/effects/spawners/structure.dm b/code/game/objects/effects/spawners/structure.dm index 7487fb7822649..30415e4e27bcf 100644 --- a/code/game/objects/effects/spawners/structure.dm +++ b/code/game/objects/effects/spawners/structure.dm @@ -26,6 +26,13 @@ again. pipe_astar_cost = 1\ ) +/obj/effect/spawner/structure/window/Initialize(mapload) + . = ..() + + if (is_station_level(z)) + var/turf/current_turf = get_turf(src) + current_turf.rcd_memory = RCD_MEMORY_WINDOWGRILLE + /obj/effect/spawner/structure/window/hollow name = "hollow window spawner" icon_state = "hwindow_spawner_full" diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index fbd37d90d2aec..94fbdfa71bb3d 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -491,6 +491,7 @@ icon_state = "" layer = ABOVE_ALL_MOB_LAYER anchored = TRUE + mouse_opacity = MOUSE_OPACITY_TRANSPARENT var/status = 0 var/delay = 0 diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index d899c38641ee2..64400f96130c8 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -49,11 +49,11 @@ RLD /obj/item/construction/examine(mob/user) . = ..() - . += "\A [src]. It currently holds [matter]/[max_matter] matter-units." + . += "It currently holds [matter]/[max_matter] matter-units." if(upgrade & RCD_UPGRADE_SILO_LINK) - . += "\A [src]. Remote storage link state: [silo_link ? "[silo_mats.on_hold() ? "ON HOLD" : "ON"]" : "OFF"]." - if(silo_link && !silo_mats.on_hold() && silo_mats.mat_container) - . += "\A [src]. Remote connection have iron in equivalent to [silo_mats.mat_container.get_material_amount(/datum/material/iron)/500] rcd units." // 1 matter for 1 floortile, as 4 tiles are produced from 1 iron + . += "Remote storage link state: [silo_link ? "[silo_mats.on_hold() ? "ON HOLD" : "ON"]" : "OFF"]." + if(silo_link && silo_mats.mat_container && !silo_mats.on_hold()) + . += "Remote connection has iron in equivalent to [silo_mats.mat_container.get_material_amount(/datum/material/iron)/500] RCD unit\s." //1 matter for 1 floor tile, as 4 tiles are produced from 1 metal /obj/item/construction/Destroy() QDEL_NULL(spark_system) @@ -137,7 +137,7 @@ RLD to_chat(user, no_ammo_message) return FALSE matter -= amount - update_icon() + update_appearance() return TRUE else var/list/matlist = list(SSmaterials.GetMaterialRef(/datum/material/iron) = 500) @@ -145,6 +145,9 @@ RLD if(user) to_chat(user, "Mineral access is on hold, please contact the quartermaster.") return FALSE + if(!silo_mats.mat_container) + to_chat(user, "No silo link detected. Connect to silo via multitool.") + return FALSE if(!silo_mats.mat_container?.has_materials(matlist, amount)) if(user) to_chat(user, no_ammo_message) @@ -155,7 +158,7 @@ RLD return TRUE /obj/item/construction/proc/checkResource(amount, mob/user) - if(!silo_mats || !silo_link) + if(!silo_link || !silo_mats || !silo_mats.mat_container) . = matter >= amount else if(silo_mats.on_hold()) @@ -191,6 +194,10 @@ RLD return FALSE return TRUE +#define RCD_DESTRUCTIVE_SCAN_RANGE 10 +#define RCD_HOLOGRAM_FADE_TIME (15 SECONDS) +#define RCD_DESTRUCTIVE_SCAN_COOLDOWN (RCD_HOLOGRAM_FADE_TIME + 1 SECONDS) + /obj/item/construction/rcd name = "rapid-construction-device (RCD)" icon = 'icons/obj/tools.dmi' @@ -203,6 +210,7 @@ RLD slot_flags = ITEM_SLOT_BELT item_flags = NO_MAT_REDEMPTION | NOBLUDGEON has_ammobar = TRUE + actions_types = list(/datum/action/item_action/rcd_scan) var/mode = RCD_FLOORWALL var/ranged = FALSE var/computer_dir = 1 @@ -220,6 +228,84 @@ RLD /// Integrated airlock electronics for setting access to a newly built airlocks var/obj/item/electronics/airlock/airlock_electronics + COOLDOWN_DECLARE(destructive_scan_cooldown) + +GLOBAL_VAR_INIT(icon_holographic_wall, init_holographic_wall()) +GLOBAL_VAR_INIT(icon_holographic_window, init_holographic_window()) + +// `initial` does not work here. Neither does instantiating a wall/whatever +// and referencing that. I don't know why. +/proc/init_holographic_wall() + return getHologramIcon( + icon('icons/turf/walls/wall.dmi', "wall-0"), + opacity = 1, + ) + +/proc/init_holographic_window() + var/icon/grille_icon = icon('icons/obj/structures.dmi', "grille") + var/icon/window_icon = icon('icons/obj/smooth_structures/windows/window.dmi', "window-0") + + grille_icon.Blend(window_icon, ICON_OVERLAY) + + return getHologramIcon(grille_icon) + +/obj/item/construction/rcd/Initialize(mapload) + . = ..() + AddElement(/datum/element/openspace_item_click_handler) + +/obj/item/construction/rcd/handle_openspace_click(turf/target, mob/user, proximity_flag, click_parameters) + if(proximity_flag) + mode = RCD_FLOORWALL + rcd_create(target, user) + +/obj/item/construction/rcd/ui_action_click(mob/user, actiontype) + if (!COOLDOWN_FINISHED(src, destructive_scan_cooldown)) + to_chat(user, "[src] lets out a low buzz.") + return + + COOLDOWN_START(src, destructive_scan_cooldown, RCD_DESTRUCTIVE_SCAN_COOLDOWN) + + playsound(src, 'sound/items/rcdscan.ogg', 50, vary = TRUE, pressure_affected = FALSE) + + var/turf/source_turf = get_turf(src) + for (var/turf/open/surrounding_turf in RANGE_TURFS(RCD_DESTRUCTIVE_SCAN_RANGE, source_turf)) + var/rcd_memory = surrounding_turf.rcd_memory + if (!rcd_memory) + continue + + var/skip_to_next_turf = FALSE + + for (var/atom/content_of_turf as anything in surrounding_turf.contents) + if (content_of_turf.density) + skip_to_next_turf = TRUE + break + + if (skip_to_next_turf) + continue + + var/hologram_icon + switch (rcd_memory) + if (RCD_MEMORY_WALL) + hologram_icon = GLOB.icon_holographic_wall + if (RCD_MEMORY_WINDOWGRILLE) + hologram_icon = GLOB.icon_holographic_window + + var/obj/effect/rcd_hologram/hologram = new (surrounding_turf) + hologram.icon = hologram_icon + animate(hologram, alpha = 0, time = RCD_HOLOGRAM_FADE_TIME, easing = CIRCULAR_EASING | EASE_IN) + +/obj/effect/rcd_hologram + name = "hologram" + mouse_opacity = MOUSE_OPACITY_TRANSPARENT + +/obj/effect/rcd_hologram/Initialize(mapload) + . = ..() + QDEL_IN(src, RCD_HOLOGRAM_FADE_TIME) + +#undef RCD_DESTRUCTIVE_SCAN_COOLDOWN +#undef RCD_DESTRUCTIVE_SCAN_RANGE +#undef RCD_HOLOGRAM_FADE_TIME + /obj/item/construction/rcd/suicide_act(mob/living/user) user.visible_message("[user] sets the RCD to 'Wall' and points it down [user.p_their()] throat! It looks like [user.p_theyre()] trying to commit suicide..") return BRUTELOSS @@ -277,6 +363,9 @@ RLD /obj/item/construction/rcd/proc/toggle_silo_link(mob/user) if(silo_mats) + if(!silo_mats.mat_container) + to_chat(user, "No silo link detected. Connect to silo via multitool.") + return FALSE silo_link = !silo_link to_chat(user, "You change \the [src]'s storage link state: [silo_link ? "ON" : "OFF"].") else @@ -490,21 +579,36 @@ RLD furnish_delay = 20 /obj/item/construction/rcd/proc/rcd_create(atom/A, mob/user) + //does this atom allow for rcd actions? var/list/rcd_results = A.rcd_vals(user, src) if(!rcd_results) return FALSE + //start animation & check resource for the action var/delay = rcd_results["delay"] * delay_mod var/obj/effect/constructing_effect/rcd_effect = new(get_turf(A), delay, src.mode) - if(checkResource(rcd_results["cost"], user)) - if(do_after(user, delay, target = A)) - if(checkResource(rcd_results["cost"], user)) - if(A.rcd_act(user, src, rcd_results["mode"])) - rcd_effect.end_animation() - useResource(rcd_results["cost"], user) - activate() - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - return TRUE - qdel(rcd_effect) + if(!checkResource(rcd_results["cost"], user)) + qdel(rcd_effect) + return FALSE + if(rcd_results["mode"] == RCD_MACHINE || rcd_results["mode"] == RCD_COMPUTER || rcd_results["mode"] == RCD_FURNISHING) + var/turf/target_turf = get_turf(A) + if(target_turf.is_blocked_turf(exclude_mobs = TRUE)) + playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) + qdel(rcd_effect) + return FALSE + if(!do_after(user, delay, target = A)) + qdel(rcd_effect) + return FALSE + if(!checkResource(rcd_results["cost"], user)) + qdel(rcd_effect) + return FALSE + if(!A.rcd_act(user, src, rcd_results["mode"])) + qdel(rcd_effect) + return FALSE + rcd_effect.end_animation() + useResource(rcd_results["cost"], user) + activate() + playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) + return TRUE /obj/item/construction/rcd/Initialize(mapload) . = ..() @@ -512,18 +616,12 @@ RLD airlock_electronics.name = "Access Control" airlock_electronics.holder = src GLOB.rcd_list += src - AddElement(/datum/element/openspace_item_click_handler) /obj/item/construction/rcd/Destroy() QDEL_NULL(airlock_electronics) GLOB.rcd_list -= src . = ..() -/obj/item/construction/rcd/handle_openspace_click(turf/target, mob/user, proximity_flag, click_parameters) - if(proximity_flag) - mode = RCD_FLOORWALL - rcd_create(target, user) - /obj/item/construction/rcd/attack_self(mob/user) ..() var/list/choices = list( @@ -636,7 +734,7 @@ RLD /obj/item/construction/rcd/Initialize(mapload) . = ..() - update_icon() + update_appearance() /obj/item/construction/rcd/borg no_ammo_message = "Insufficient charge." @@ -802,7 +900,7 @@ RLD if(checkResource(deconcost, user)) to_chat(user, "You start deconstructing [A]...") user.Beam(A,icon_state="nzcrentrs_power", time = 15) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) + playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE) if(do_after(user, decondelay, target = A)) if(!useResource(deconcost, user)) return 0 @@ -817,7 +915,7 @@ RLD to_chat(user, "You start building a wall light...") user.Beam(A,icon_state="nzcrentrs_power", time = 15) playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - playsound(src.loc, 'sound/effects/light_flicker.ogg', 50, 0) + playsound(src.loc, 'sound/effects/light_flicker.ogg', 50, FALSE) if(do_after(user, floordelay, target = A)) if(!istype(W)) return FALSE @@ -831,7 +929,7 @@ RLD candidates += C if(!candidates.len) to_chat(user, "Valid target not found...") - playsound(src.loc, 'sound/misc/compiler-failure.ogg', 30, 1) + playsound(src.loc, 'sound/misc/compiler-failure.ogg', 30, TRUE) return FALSE for(var/turf/open/O in candidates) if(istype(O)) @@ -862,8 +960,8 @@ RLD if(checkResource(floorcost, user)) to_chat(user, "You start building a floor light...") user.Beam(A,icon_state="nzcrentrs_power", time = 15) - playsound(src.loc, 'sound/machines/click.ogg', 50, 1) - playsound(src.loc, 'sound/effects/light_flicker.ogg', 50, 1) + playsound(loc, 'sound/machines/click.ogg', 50, TRUE) + playsound(loc, 'sound/effects/light_flicker.ogg', 50, TRUE) if(do_after(user, floordelay, target = A)) if(!istype(F)) return 0 @@ -918,7 +1016,6 @@ RLD . = ..() set_plumbing_designs() - ///Set the list of designs this plumbing rcd can make /obj/item/construction/plumbing/proc/set_plumbing_designs() plumbing_design_types = list( @@ -1015,6 +1112,10 @@ RLD desc = "It contains the design for chairs, stools, tables, and glass tables." upgrade = RCD_UPGRADE_FURNISHING +/datum/action/item_action/rcd_scan + name = "Destruction Scan" + desc = "Scans the surrounding area for destruction. Scanned structures will rebuild significantly faster." + #undef GLOW_MODE #undef LIGHT_MODE #undef REMOVE_MODE diff --git a/code/game/objects/items/RPD.dm b/code/game/objects/items/RPD.dm index 96be0b40ffc06..413c3f36b725b 100644 --- a/code/game/objects/items/RPD.dm +++ b/code/game/objects/items/RPD.dm @@ -56,6 +56,7 @@ GLOBAL_LIST_INIT(disposal_pipe_recipes, list( new /datum/pipe_info/disposal("Y-Junction", /obj/structure/disposalpipe/junction/yjunction), new /datum/pipe_info/disposal("Sort Junction", /obj/structure/disposalpipe/sorting/mail, PIPE_TRIN_M), new /datum/pipe_info/disposal("Package Junction", /obj/structure/disposalpipe/sorting/wrap, PIPE_TRIN_M), + new /datum/pipe_info/disposal("Unsorted Mail Junction", /obj/structure/disposalpipe/sorting/unsorted, PIPE_TRIN_M), new /datum/pipe_info/disposal("Trunk", /obj/structure/disposalpipe/trunk), new /datum/pipe_info/disposal("Bin", /obj/machinery/disposal/bin, PIPE_ONEDIR), new /datum/pipe_info/disposal("Outlet", /obj/structure/disposaloutlet), diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index b016188c0b4c9..c1f0df23f3199 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -395,7 +395,10 @@ /obj/structure/girder/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_FLOORWALL) - return list("mode" = RCD_FLOORWALL, "delay" = 20, "cost" = 8) + return rcd_result_with_memory( + list("mode" = RCD_FLOORWALL, "delay" = 2 SECONDS, "cost" = 8), + get_turf(src), RCD_MEMORY_WALL, + ) if(RCD_DECONSTRUCT) return list("mode" = RCD_DECONSTRUCT, "delay" = 20, "cost" = 13) return FALSE diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm index 5d5f99b5e0f8a..753abd9bc564d 100644 --- a/code/game/objects/structures/grille.dm +++ b/code/game/objects/structures/grille.dm @@ -1,3 +1,6 @@ +/// Max number of unanchored items that will be moved from a tile when attempting to add a window to a grille. +#define CLEAR_TILE_MOVE_LIMIT 20 + /obj/structure/grille desc = "A flimsy framework of iron rods." name = "grille" @@ -16,8 +19,6 @@ var/rods_type = /obj/item/stack/rods var/rods_amount = 2 var/rods_broken = TRUE - var/grille_type = null - var/broken_type = /obj/structure/grille/broken rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE FASTDMM_PROP(\ pipe_astar_cost = 1\ @@ -53,9 +54,17 @@ if(RCD_DECONSTRUCT) return list("mode" = RCD_DECONSTRUCT, "delay" = 20, "cost" = 5) if(RCD_WINDOWGRILLE) + var/cost = 8 + var/delay = 2 SECONDS + if(the_rcd.window_glass == RCD_WINDOW_REINFORCED) - return list("mode" = RCD_WINDOWGRILLE, "delay" = 40, "cost" = 12) - return list("mode" = RCD_WINDOWGRILLE, "delay" = 20, "cost" = 8) + delay = 4 SECONDS + cost = 12 + + return rcd_result_with_memory( + list("mode" = RCD_WINDOWGRILLE, "delay" = delay, "cost" = cost), + get_turf(src), RCD_MEMORY_WINDOWGRILLE, + ) return FALSE /obj/structure/grille/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) @@ -70,6 +79,12 @@ return FALSE var/turf/local_turf = loc + if(repair_grille()) + to_chat(user, "You rebuild the broken grille.") + + if(!clear_tile(user)) + return FALSE + if(!ispath(the_rcd.window_type, /obj/structure/window)) CRASH("Invalid window path type in RCD: [the_rcd.window_type]") var/obj/structure/window/window_path = the_rcd.window_type @@ -90,6 +105,29 @@ new /obj/structure/grille/ratvar(src.loc) qdel(src) +/obj/structure/grille/proc/clear_tile(mob/user) + var/at_users_feet = get_turf(user) + + var/unanchored_items_on_tile + var/obj/item/last_item_moved + for(var/obj/item/item_to_move in loc.contents) + if(!item_to_move.anchored) + if(unanchored_items_on_tile <= CLEAR_TILE_MOVE_LIMIT) + item_to_move.forceMove(at_users_feet) + last_item_moved = item_to_move + unanchored_items_on_tile++ + + if(!unanchored_items_on_tile) + return TRUE + + to_chat(user, "You move [unanchored_items_on_tile == 1 ? "[last_item_moved]" : "some things"] out of the way.") + + if(unanchored_items_on_tile - CLEAR_TILE_MOVE_LIMIT > 0) + to_chat(user, "There's still too much stuff in the way!") + return FALSE + + return TRUE + /obj/structure/grille/Bumped(atom/movable/AM) if(!ismob(AM)) return @@ -164,9 +202,8 @@ if(!shock(user, 90 * W.siemens_coefficient)) user.visible_message("[user] rebuilds the broken grille.", \ "You rebuild the broken grille.") - new grille_type(src.loc) + repair_grille() R.use(1) - qdel(src) return //window placing begin @@ -183,12 +220,16 @@ for(var/obj/structure/window/WINDOW in loc) to_chat(user, "There is already a window there!") return + if(!clear_tile(user)) + return to_chat(user, "You start placing the window...") if(do_after(user,20, target = src)) if(!src.loc || !anchored) //Grille broken or unanchored while waiting return for(var/obj/structure/window/WINDOW in loc) //Another window already installed on grille return + if(!clear_tile(user)) + return var/obj/structure/window/WD if(istype(W, /obj/item/stack/sheet/plasmarglass)) WD = new/obj/structure/window/plasma/reinforced/fulltile(drop_location()) //reinforced plasma window @@ -240,15 +281,29 @@ /obj/structure/grille/obj_break() . = ..() if(!broken && !(flags_1 & NODECONSTRUCT_1)) - new broken_type(src.loc) + icon_state = "brokengrille" + density = FALSE + obj_integrity = 20 + broken = TRUE + rods_amount = 1 + rods_broken = FALSE var/drop_loc = drop_location() var/obj/R = new rods_type(drop_loc, rods_broken) if(QDELETED(R)) // the rods merged with something on the tile R = locate(rods_type) in drop_loc if(R) transfer_fingerprints_to(R) - qdel(src) +/obj/structure/grille/proc/repair_grille() + if(broken) + icon_state = "grille" + density = TRUE + obj_integrity = max_integrity + broken = FALSE + rods_amount = 2 + rods_broken = TRUE + return TRUE + return FALSE // shock user with probability prb (if all connections & power are working) // returns 1 if shocked, 0 otherwise @@ -300,8 +355,6 @@ broken = TRUE rods_amount = 1 rods_broken = FALSE - grille_type = /obj/structure/grille - broken_type = null /obj/structure/grille/broken/Initialize(mapload) . = ..() diff --git a/code/game/objects/structures/life_candle.dm b/code/game/objects/structures/life_candle.dm index 83a562ace450b..40a7079e5a7de 100644 --- a/code/game/objects/structures/life_candle.dm +++ b/code/game/objects/structures/life_candle.dm @@ -24,6 +24,10 @@ var/respawn_time = 50 var/respawn_sound = 'sound/magic/staff_animation.ogg' +/obj/structure/life_candle/ComponentInitialize() + . = ..() + AddElement(/datum/element/movetype_handler) + /obj/structure/life_candle/attack_hand(mob/user) . = ..() if(.) @@ -33,12 +37,15 @@ if(user.mind in linked_minds) user.visible_message("[user] reaches out and pinches the flame of [src].", "You sever the connection between yourself and [src].") linked_minds -= user.mind + if(!linked_minds.len) + REMOVE_TRAIT(src, TRAIT_MOVE_FLOATING, LIFECANDLE_TRAIT) else user.visible_message("[user] touches [src]. It seems to respond to [user.p_their()] presence!", "You create a connection between you and [src].") linked_minds |= user.mind + if(!linked_minds.len) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LIFECANDLE_TRAIT) update_icon() - float(linked_minds.len) if(linked_minds.len) START_PROCESSING(SSobj, src) set_light(lit_luminosity) diff --git a/code/game/turfs/change_turf.dm b/code/game/turfs/change_turf.dm index 77ae7704e3236..c4e3061cc1862 100644 --- a/code/game/turfs/change_turf.dm +++ b/code/game/turfs/change_turf.dm @@ -86,6 +86,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( var/old_lighting_corner_NW = lighting_corner_NW var/old_directional_opacity = directional_opacity var/old_dynamic_lumcount = dynamic_lumcount + var/old_rcd_memory = rcd_memory var/old_opacity = opacity // Z-Mimic: copy above @@ -133,6 +134,7 @@ GLOBAL_LIST_INIT(blacklisted_automated_baseturfs, typecacheof(list( new_turf.AfterChange(flags) new_turf.blueprint_data = old_bp + new_turf.rcd_memory = old_rcd_memory lighting_corner_NE = old_lighting_corner_NE lighting_corner_SE = old_lighting_corner_SE diff --git a/code/game/turfs/closed/wall/misc_walls.dm b/code/game/turfs/closed/wall/misc_walls.dm index 93ec8a029dd50..25bf34ac5e914 100644 --- a/code/game/turfs/closed/wall/misc_walls.dm +++ b/code/game/turfs/closed/wall/misc_walls.dm @@ -49,6 +49,7 @@ smoothing_flags = NONE canSmoothWith = null smoothing_groups = null + rcd_memory = null /turf/closed/wall/vault/rock name = "rocky wall" @@ -71,6 +72,7 @@ smoothing_flags = SMOOTH_BITMASK desc = "A wall covered in a thick sheet of ice." canSmoothWith = null + rcd_memory = null hardness = 35 slicing_duration = 150 //welding through the ice+metal bullet_sizzle = TRUE diff --git a/code/game/turfs/closed/walls.dm b/code/game/turfs/closed/walls.dm index 1b53cc53ad8e5..15e769167b12b 100644 --- a/code/game/turfs/closed/walls.dm +++ b/code/game/turfs/closed/walls.dm @@ -10,6 +10,7 @@ smoothing_groups = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_WALLS) canSmoothWith = list(SMOOTH_GROUP_WALLS) //note consider "canSmoothWith = list(SMOOTH_GROUP_WALLS, SMOOTH_GROUP_WINDOW_FULLTILE, SMOOTH_GROUP_AIRLOCK)" if the artstyle permits it! + rcd_memory = RCD_MEMORY_WALL explosion_block = 1 thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT @@ -137,11 +138,12 @@ var/obj/item/wallframe/F = W if(F.try_build(src, user)) F.attach(src, user) - return TRUE + return TRUE + return FALSE //Poster stuff - else if(istype(W, /obj/item/poster)) - place_poster(W,user) - return TRUE + else if(istype(W, /obj/item/poster) && Adjacent(user)) //no tk memes. + return place_poster(W,user) + return FALSE /turf/closed/wall/try_decon(obj/item/I, mob/user, turf/T) diff --git a/code/game/turfs/open/floor.dm b/code/game/turfs/open/floor.dm index 5f8ec518aee3d..dff3014bb8dcc 100644 --- a/code/game/turfs/open/floor.dm +++ b/code/game/turfs/open/floor.dm @@ -182,7 +182,13 @@ /turf/open/floor/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_FLOORWALL) - return list("mode" = RCD_FLOORWALL, "delay" = 20, "cost" = 16) + var/obj/structure/girder/girder = locate() in src + if(girder) + return girder.rcd_vals(user, the_rcd) + return rcd_result_with_memory( + list("mode" = RCD_FLOORWALL, "delay" = 2 SECONDS, "cost" = 16), + src, RCD_MEMORY_WALL, + ) if(RCD_LADDER) return list("mode" = RCD_LADDER, "delay" = 25, "cost" = 16) if(RCD_AIRLOCK) @@ -193,7 +199,10 @@ if(RCD_DECONSTRUCT) return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 33) if(RCD_WINDOWGRILLE) - return list("mode" = RCD_WINDOWGRILLE, "delay" = 10, "cost" = 4) + return rcd_result_with_memory( + list("mode" = RCD_WINDOWGRILLE, "delay" = 1 SECONDS, "cost" = 4), + src, RCD_MEMORY_WINDOWGRILLE, + ) if(RCD_MACHINE) return list("mode" = RCD_MACHINE, "delay" = 20, "cost" = 25) if(RCD_COMPUTER) @@ -205,6 +214,9 @@ /turf/open/floor/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_FLOORWALL) + var/obj/structure/girder/girder = locate() in src + if(girder) + return girder.rcd_act(user, the_rcd, passed_mode) to_chat(user, "You build a wall.") log_attack("[key_name(user)] has constructed a wall at [loc_name(src)] using [format_text(initial(the_rcd.name))]") var/overlapping_lattice = locate(/obj/structure/lattice) in get_turf(src) @@ -218,7 +230,10 @@ L.set_anchored(TRUE) return TRUE if(RCD_AIRLOCK) - if(locate(/obj/machinery/door/airlock) in src || locate(/obj/machinery/door/window) in src) + for(var/obj/machinery/door/door in src) + if(door.sub_door) + continue + to_chat(user, "There is another door here!") return FALSE if(ispath(the_rcd.airlock_type, /obj/machinery/door/window)) to_chat(user, "You build a windoor.") diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm index bbeab37719b8f..c0a5cc490813b 100644 --- a/code/game/turfs/turf.dm +++ b/code/game/turfs/turf.dm @@ -59,6 +59,11 @@ GLOBAL_LIST_EMPTY(created_baseturf_lists) ///the holodeck can load onto this turf if TRUE var/holodeck_compatible = FALSE + /// If this turf contained an RCD'able object (or IS one, for walls) + /// but is now destroyed, this will preserve the value. + /// See __DEFINES/construction.dm for RCD_MEMORY_*. + var/rcd_memory + ///Icon-smoothing variable to map a diagonal wall corner with a fixed underlay. var/list/fixed_underlay = null diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index c77f6d58ce261..b4cac583e2998 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -1213,6 +1213,8 @@ Traitors and the like can also be revived with the previous role mostly intact. var/source = "adminabuse" switch(add_or_remove) if("Add") //Not doing source choosing here intentionally to make this bit faster to use, you can always vv it. + if(GLOB.movement_type_trait_to_flag[chosen_trait]) //include the required element. + D.AddElement(/datum/element/movetype_handler) ADD_TRAIT(D,chosen_trait,source) if("Remove") var/specific = input("All or specific source ?", "Trait Remove/Add") as null|anything in list("All","Specific") diff --git a/code/modules/antagonists/blob/blob_mobs.dm b/code/modules/antagonists/blob/blob_mobs.dm index d2e8650552041..790157494eaf3 100644 --- a/code/modules/antagonists/blob/blob_mobs.dm +++ b/code/modules/antagonists/blob/blob_mobs.dm @@ -107,7 +107,8 @@ attack_verb_continuous = "hits" attack_verb_simple = "hit" attack_sound = 'sound/weapons/genhit1.ogg' - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE del_on_death = TRUE deathmessage = "explodes into a cloud of gas!" gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/antagonists/clock_cult/clockwork_turfs.dm b/code/modules/antagonists/clock_cult/clockwork_turfs.dm index 329b56ba411c8..36a9381d42eac 100644 --- a/code/modules/antagonists/clock_cult/clockwork_turfs.dm +++ b/code/modules/antagonists/clock_cult/clockwork_turfs.dm @@ -476,7 +476,6 @@ icon_state = "ratvargrille" name = "cog grille" desc = "A strangely-shaped grille." - broken_type = /obj/structure/grille/ratvar/broken /obj/structure/grille/ratvar/Initialize(mapload) . = ..() @@ -497,6 +496,33 @@ /obj/structure/grille/ratvar/ratvar_act() return +/obj/structure/grille/ratvar/obj_break() + . = ..() + if(!broken && !(flags_1 & NODECONSTRUCT_1)) + icon_state = "brokenratvargrille" + density = FALSE + obj_integrity = 20 + broken = TRUE + rods_amount = 1 + rods_broken = FALSE + var/drop_loc = drop_location() + var/obj/R = new rods_type(drop_loc, rods_broken) + if(QDELETED(R)) // the rods merged with something on the tile + R = locate(rods_type) in drop_loc + if(R) + transfer_fingerprints_to(R) + +/obj/structure/grille/ratvar/repair_grille() + if(broken) + icon_state = "ratvargrille" + density = TRUE + obj_integrity = max_integrity + broken = FALSE + rods_amount = 2 + rods_broken = TRUE + return TRUE + return FALSE + /obj/structure/grille/ratvar/broken icon_state = "brokenratvargrille" density = FALSE @@ -504,8 +530,6 @@ rods_type = /obj/item/stack/sheet/brass rods_amount = 1 rods_broken = FALSE - grille_type = /obj/structure/grille/ratvar - broken_type = null /obj/structure/grille/ratvar/broken/Initialize(mapload) . = ..() diff --git a/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm b/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm index 3e0490b4b8b51..de535c8d1b666 100644 --- a/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clock_cult/mobs/clockwork_marauder.dm @@ -16,7 +16,7 @@ GLOBAL_LIST_EMPTY(clockwork_marauders) atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = INFINITY - movement_type = FLYING + is_flying_animal = TRUE move_resist = MOVE_FORCE_OVERPOWERING mob_size = MOB_SIZE_LARGE pass_flags = PASSTABLE diff --git a/code/modules/antagonists/clock_cult/mobs/eminence.dm b/code/modules/antagonists/clock_cult/mobs/eminence.dm index 5dbc2d84ff6ce..276e4f2495c3f 100644 --- a/code/modules/antagonists/clock_cult/mobs/eminence.dm +++ b/code/modules/antagonists/clock_cult/mobs/eminence.dm @@ -24,7 +24,8 @@ status_flags = 0 wander = FALSE density = FALSE - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE move_resist = MOVE_FORCE_OVERPOWERING mob_size = MOB_SIZE_TINY pass_flags = PASSTABLE | PASSGRILLE | PASSMOB @@ -140,6 +141,12 @@ tab_data["Cogs Available"] = GENERATE_STAT_TEXT("[cogs] Cogs") return tab_data +/mob/living/simple_animal/eminence/med_hud_set_health() + return + +/mob/living/simple_animal/eminence/med_hud_set_status() + return + /mob/living/simple_animal/eminence/update_health_hud() return diff --git a/code/modules/antagonists/clock_cult/traps/receivers/skewer.dm b/code/modules/antagonists/clock_cult/traps/receivers/skewer.dm index d951eb4e22e5f..d9d66ea55c9f4 100644 --- a/code/modules/antagonists/clock_cult/traps/receivers/skewer.dm +++ b/code/modules/antagonists/clock_cult/traps/receivers/skewer.dm @@ -27,7 +27,7 @@ var/target_stabbed = FALSE density = TRUE for(var/mob/living/M in get_turf(src)) - if(M.incorporeal_move || M.is_flying()) + if(M.incorporeal_move || M.movement_type & (FLOATING|FLYING)) continue if(buckle_mob(M, TRUE)) target_stabbed = TRUE diff --git a/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm b/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm index 159afb8ace32e..e4b55981a9328 100644 --- a/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm +++ b/code/modules/antagonists/clock_cult/traps/senders/pressure_sensor.dm @@ -34,7 +34,7 @@ if(istype(M)) if(is_servant_of_ratvar(M)) return - if(M.incorporeal_move || M.is_flying()) + if(M.incorporeal_move || M.movement_type & (FLOATING|FLYING)) return else return diff --git a/code/modules/antagonists/revenant/revenant.dm b/code/modules/antagonists/revenant/revenant.dm index 4dcd3d8d278b0..b6e68b0a9167e 100644 --- a/code/modules/antagonists/revenant/revenant.dm +++ b/code/modules/antagonists/revenant/revenant.dm @@ -43,7 +43,6 @@ status_flags = 0 wander = FALSE density = FALSE - movement_type = FLYING move_resist = MOVE_FORCE_OVERPOWERING mob_size = MOB_SIZE_TINY pass_flags = PASSTABLE | PASSMOB @@ -87,6 +86,8 @@ AddComponent(/datum/component/tracking_beacon, "ghost", null, null, TRUE, "#9e4d91", TRUE, TRUE, "#490066") grant_all_languages(TRUE, FALSE, FALSE, LANGUAGE_REVENANT) // rev can understand every langauge ADD_TRAIT(src, TRAIT_FREE_HYPERSPACE_MOVEMENT, INNATE_TRAIT) + AddElement(/datum/element/movetype_handler) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost") /mob/living/simple_animal/revenant/onTransitZ(old_z, new_z) . = ..() @@ -416,8 +417,7 @@ /mob/living/simple_animal/revenant/stop_orbit(datum/component/orbiter/orbits) // reset the simple_flying animation - animate(src, pixel_y = 2, time = 1 SECONDS, loop = -1, flags = ANIMATION_RELATIVE) - animate(pixel_y = -2, time = 1 SECONDS, flags = ANIMATION_RELATIVE) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost") return ..() /// Incorporeal move check: blocked by holy-watered tiles and salt piles. diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 2ca00e5b20de5..85b96e894dc64 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -56,6 +56,7 @@ /mob/living/simple_animal/revenant/orbit(atom/target) setDir(SOUTH) // reset dir so the right directional sprites show up + REMOVE_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost") return ..() diff --git a/code/modules/events/operative.dm b/code/modules/events/operative.dm index f74c5d70b172f..2c39b70c6efa3 100644 --- a/code/modules/events/operative.dm +++ b/code/modules/events/operative.dm @@ -18,8 +18,14 @@ var/mob/dead/selected = pick_n_take(candidates) var/list/spawn_locs = list() - for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) - spawn_locs += L.loc + if(!spawn_locs.len) //try the new lone_ops spawner first + for(var/obj/effect/landmark/loneops/L in GLOB.landmarks_list) + if(isturf(L.loc)) + spawn_locs += L.loc + if(!spawn_locs.len) //If we can't find any valid spawnpoints, try the carp spawns + for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) + if(isturf(L.loc)) + spawn_locs += L.loc if(!spawn_locs.len) return MAP_ERROR diff --git a/code/modules/holoparasite/_holoparasite.dm b/code/modules/holoparasite/_holoparasite.dm index 30c7e5f0eb9bf..e7b0e0cf7ee13 100644 --- a/code/modules/holoparasite/_holoparasite.dm +++ b/code/modules/holoparasite/_holoparasite.dm @@ -25,7 +25,8 @@ GLOBAL_LIST_EMPTY_TYPED(holoparasites, /mob/living/simple_animal/hostile/holopar light_on = FALSE a_intent = INTENT_HARM stop_automated_movement = TRUE - movement_type = FLYING // Immunity to chasms and landmines, etc. + is_flying_animal = TRUE // Immunity to chasms and landmines, etc. + no_flying_animation = TRUE attack_sound = "punch" atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm index 3ed4731b5b846..5710d58fc701b 100644 --- a/code/modules/library/lib_items.dm +++ b/code/modules/library/lib_items.dm @@ -45,7 +45,7 @@ if(!isbook(I)) continue I.forceMove(src) - update_appearance() + update_icon_state() /obj/structure/bookcase/examine(mob/user) . = ..() @@ -141,8 +141,6 @@ return if(!istype(user)) return - if(!length(contents)) - return if(load_random_books) create_random_books(books_to_load, src, FALSE, random_category) load_random_books = FALSE diff --git a/code/modules/mining/equipment/wormhole_jaunter.dm b/code/modules/mining/equipment/wormhole_jaunter.dm index 2b01cd25a1ddd..5d06cca10e6b6 100644 --- a/code/modules/mining/equipment/wormhole_jaunter.dm +++ b/code/modules/mining/equipment/wormhole_jaunter.dm @@ -50,7 +50,7 @@ try_move_adjacent(J) else user.Paralyze(2 SECONDS, TRUE, TRUE) //Ignore stun immunity here, for their own good - user.setMovetype(user.movement_type | FLOATING) //Prevents falling into chasm during delay, automatically removed upon movement + ADD_TRAIT(user, TRAIT_MOVE_FLOATING, "jaunter") //Prevents falling into chasm during delay, automatically removed upon movement addtimer(CALLBACK(J, TYPE_PROC_REF(/atom, attackby), null, user), 1 SECONDS) //Forcibly teleport them away from the chasm after a brief dramatic delay playsound(src,'sound/effects/sparks4.ogg',50,1) qdel(src) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 14f4eecfaa6eb..8a238b6a098c9 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -16,7 +16,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT) lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE invisibility = INVISIBILITY_SPIRIT hud_type = /datum/hud/ghost - movement_type = GROUND | FLYING + movement_type = FLYING | FLOATING light_system = MOVABLE_LIGHT light_range = 1 light_power = 2 @@ -135,9 +135,6 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT) remove_verb(/mob/dead/observer/verb/boo) remove_verb(/mob/dead/observer/verb/possess) - animate(src, pixel_y = 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) - animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) - add_to_dead_mob_list() for(var/v in GLOB.active_alternate_appearances) @@ -153,6 +150,8 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_SPIRIT) data_huds_on = 1 AddComponent(/datum/component/tracking_beacon, "ghost", null, null, TRUE, "#9e4d91", TRUE, TRUE, "#490066") + AddElement(/datum/element/movetype_handler) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, "ghost") /mob/dead/observer/get_photo_description(obj/item/camera/camera) return "You can also see a g-g-g-g-ghooooost!" @@ -454,7 +453,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp // This is the ghost's follow verb with an argument /mob/dead/observer/check_orbitable(atom/movable/target_original) var/atom/movable/target = target_original.get_orbitable() - if (!istype(target)) + if (!istype(target) || orbiting?.parent == target_original) return var/icon/I = icon(target.icon,target.icon_state,target.dir) @@ -486,8 +485,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp . = ..() //restart our floating animation after orbit is done. pixel_y = base_pixel_y - animate(src, pixel_y = base_pixel_y + 2, time = 1 SECONDS, loop = -1) - animate(pixel_y = -2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) /mob/dead/observer/verb/jumptomob() //Moves the ghost instead of just changing the ghosts's eye -Nodrak set category = "Ghost" diff --git a/code/modules/mob/living/basic/basic.dm b/code/modules/mob/living/basic/basic.dm index e853c16df621a..2101a9406c67f 100644 --- a/code/modules/mob/living/basic/basic.dm +++ b/code/modules/mob/living/basic/basic.dm @@ -140,7 +140,6 @@ icon = initial(icon) icon_state = icon_living density = initial(density) - setMovetype(initial(movement_type)) /mob/living/basic/proc/melee_attack(atom/target) src.face_atom(target) diff --git a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm index 1b024ec6aa2b5..96cb3c54cc149 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm @@ -87,8 +87,3 @@ if(leaping) //check that toggles out of leaping mode if the alien gets hit or otherwise interrupted leaping = FALSE update_icons() - -/mob/living/carbon/alien/humanoid/float(on) - if(leaping) - return - return ..() diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm index 6c2324f0f8bf5..30e08eeb84c6e 100644 --- a/code/modules/mob/living/carbon/carbon.dm +++ b/code/modules/mob/living/carbon/carbon.dm @@ -909,7 +909,6 @@ ///Proc to hook behavior on bodypart removals. /mob/living/carbon/proc/remove_bodypart(obj/item/bodypart/old_bodypart) bodyparts -= old_bodypart - switch(old_bodypart.body_part) if(LEG_LEFT, LEG_RIGHT) set_num_legs(num_legs - 1) @@ -943,43 +942,51 @@ if(href_list[VV_HK_MODIFY_BODYPART]) if(!check_rights(R_SPAWN)) return - var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("add","remove", "augment") + var/edit_action = input(usr, "What would you like to do?","Modify Body Part") as null|anything in list("replace","remove") if(!edit_action) return var/list/limb_list = list() - if(edit_action == "remove" || edit_action == "augment") - for(var/obj/item/bodypart/B in bodyparts) + if(edit_action == "remove") + for(var/obj/item/bodypart/B as anything in bodyparts) limb_list += B.body_zone - if(edit_action == "remove") limb_list -= BODY_ZONE_CHEST else - limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) - for(var/obj/item/bodypart/B in bodyparts) - limb_list -= B.body_zone - var/result = input(usr, "Please choose which body part to [edit_action]","[capitalize(edit_action)] Body Part") as null|anything in limb_list + limb_list = list(BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG, BODY_ZONE_CHEST) + var/result = input(usr, "Please choose which bodypart to [edit_action]","[capitalize(edit_action)] Bodypart") as null|anything in sort_list(limb_list) if(result) var/obj/item/bodypart/BP = get_bodypart(result) + var/list/limbtypes = list() + switch(result) + if(BODY_ZONE_CHEST) + limbtypes = typesof(/obj/item/bodypart/chest) + if(BODY_ZONE_R_ARM) + limbtypes = typesof(/obj/item/bodypart/r_arm) + if(BODY_ZONE_L_ARM) + limbtypes = typesof(/obj/item/bodypart/l_arm) + if(BODY_ZONE_HEAD) + limbtypes = typesof(/obj/item/bodypart/head) + if(BODY_ZONE_L_LEG) + limbtypes = typesof(/obj/item/bodypart/l_leg) + if(BODY_ZONE_R_LEG) + limbtypes = typesof(/obj/item/bodypart/r_leg) switch(edit_action) if("remove") if(BP) - BP.drop_limb() - else - to_chat(usr, "[src] doesn't have such bodypart.") - if("add") - if(BP) - to_chat(usr, "[src] already has such bodypart.") + BP.drop_limb(special = TRUE) + admin_ticket_log("[key_name_admin(usr)] has removed [src]'s [parse_zone(BP.body_zone)]") else - if(!regenerate_limb(result)) - to_chat(usr, "[src] cannot have such bodypart.") - if("augment") - if(ishuman(src)) - if(BP) - BP.change_bodypart_status(BODYTYPE_ROBOTIC, TRUE, TRUE) - else - to_chat(usr, "[src] doesn't have such bodypart.") + to_chat(usr, "[src] doesn't have such bodypart.") + admin_ticket_log("[key_name_admin(usr)] has attempted to modify the bodyparts of [src]") + if("replace") + var/limb2add = input(usr, "Select a bodypart type to add", "Add/Replace Bodypart") as null|anything in sort_list(limbtypes) + var/obj/item/bodypart/new_bp = new limb2add() + + if(new_bp.replace_limb(src, special = TRUE)) + admin_ticket_log("[key_name_admin(usr)] has replaced [src]'s [BP.type] with [new_bp.type]") + qdel(BP) else - to_chat(usr, "Only humans can be augmented.") - admin_ticket_log("[key_name_admin(usr)] has modified the bodyparts of [src]") + to_chat(usr, "Failed to replace bodypart! They might be incompatible.") + admin_ticket_log("[key_name_admin(usr)] has attempted to modify the bodyparts of [src]") if(href_list[VV_HK_MAKE_AI]) if(!check_rights(R_SPAWN)) diff --git a/code/modules/mob/living/carbon/carbon_movement.dm b/code/modules/mob/living/carbon/carbon_movement.dm index 33b556e736336..dcf4439f0018a 100644 --- a/code/modules/mob/living/carbon/carbon_movement.dm +++ b/code/modules/mob/living/carbon/carbon_movement.dm @@ -56,17 +56,17 @@ if(!usable_legs && !(movement_type & (FLYING | FLOATING))) ADD_TRAIT(src, TRAIT_IMMOBILIZED, LACKING_LOCOMOTION_APPENDAGES_TRAIT) +/mob/living/carbon/on_movement_type_flag_enabled(datum/source, flag) + var/old_movetype = movement_type + . = ..() + if(flag & (FLYING | FLOATING) && !(old_movetype & (FLYING | FLOATING))) + remove_movespeed_modifier(/datum/movespeed_modifier/limbless) + REMOVE_TRAIT(src, TRAIT_FLOORED, LACKING_LOCOMOTION_APPENDAGES_TRAIT) + REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, LACKING_LOCOMOTION_APPENDAGES_TRAIT) -/mob/living/carbon/setMovetype(newval) +/mob/living/carbon/on_movement_type_flag_disabled(datum/source, flag) . = ..() - if(isnull(.)) - return - if(!(. & (FLYING | FLOATING))) - if(movement_type & (FLYING | FLOATING)) //From not flying to flying. - remove_movespeed_modifier(/datum/movespeed_modifier/limbless) - REMOVE_TRAIT(src, TRAIT_FLOORED, LACKING_LOCOMOTION_APPENDAGES_TRAIT) - REMOVE_TRAIT(src, TRAIT_IMMOBILIZED, LACKING_LOCOMOTION_APPENDAGES_TRAIT) - else if(!(movement_type & (FLYING | FLOATING))) //From flying to no longer flying. + if(flag & (FLYING | FLOATING) && !(movement_type & (FLYING | FLOATING))) var/limbless_slowdown = 0 if(usable_legs < default_num_legs) limbless_slowdown += (default_num_legs - usable_legs) * 3 diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 7372fb37f1ef1..090928d713575 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -811,11 +811,6 @@ /mob/living/carbon/human/can_hold_items() return TRUE -/mob/living/carbon/human/update_gravity(has_gravity,override = 0) - if(dna && dna.species) //prevents a runtime while a human is being monkeyfied - override = dna.species.override_float - ..() - /mob/living/carbon/human/vomit(lost_nutrition = 10, blood = 0, stun = 1, distance = 0, message = 1, toxic = 0) if(blood && (NOBLOOD in dna.species.species_traits)) if(message) diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm index 8874bad02caff..ec07a513434e7 100644 --- a/code/modules/mob/living/carbon/human/species.dm +++ b/code/modules/mob/living/carbon/human/species.dm @@ -101,7 +101,6 @@ GLOBAL_LIST_EMPTY(features_by_species) var/obj/item/organ/liver/mutantliver var/obj/item/organ/stomach/mutantstomach - var/override_float = FALSE //Bitflag that controls what in game ways can select this species as a spawnable source //Think magic mirror and pride mirror, slime extract, ERT etc, see defines @@ -2346,19 +2345,17 @@ GLOBAL_LIST_EMPTY(features_by_species) //UNSAFE PROC, should only be called through the Activate or other sources that check for CanFly /datum/species/proc/toggle_flight(mob/living/carbon/human/H) - if(!(H.movement_type & FLYING)) + if(!HAS_TRAIT_FROM(H, TRAIT_MOVE_FLYING, SPECIES_FLIGHT_TRAIT)) stunmod *= 2 speedmod -= 0.35 - H.setMovetype(H.movement_type | FLYING) - override_float = TRUE + ADD_TRAIT(H, TRAIT_MOVE_FLYING, SPECIES_FLIGHT_TRAIT) H.pass_flags |= PASSTABLE if(("wings" in H.dna.species.mutant_bodyparts) || ("moth_wings" in H.dna.species.mutant_bodyparts)) H.Togglewings() else stunmod *= 0.5 speedmod += 0.35 - H.setMovetype(H.movement_type & ~FLYING) - override_float = FALSE + REMOVE_TRAIT(H, TRAIT_MOVE_FLYING, SPECIES_FLIGHT_TRAIT) H.pass_flags &= ~PASSTABLE if(("wingsopen" in H.dna.species.mutant_bodyparts) || ("moth_wingsopen" in H.dna.species.mutant_bodyparts)) H.Togglewings() diff --git a/code/modules/mob/living/carbon/update_icons.dm b/code/modules/mob/living/carbon/update_icons.dm index 505201504141c..a02ae4866236f 100644 --- a/code/modules/mob/living/carbon/update_icons.dm +++ b/code/modules/mob/living/carbon/update_icons.dm @@ -21,8 +21,8 @@ resize = RESIZE_DEFAULT_SIZE if(changed) + SEND_SIGNAL(src, COMSIG_PAUSE_FLOATING_ANIM, 0.3 SECONDS) animate(src, transform = ntransform, time = (lying_prev == 0 || lying_angle == 0) ? 2 : 0, pixel_y = final_pixel_y, dir = final_dir, easing = (EASE_IN|EASE_OUT)) - setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure we restart it in next life(). UPDATE_OO_IF_PRESENT /mob/living/carbon diff --git a/code/modules/mob/living/init_signals.dm b/code/modules/mob/living/init_signals.dm index 108570a584da3..b3608f641cd33 100644 --- a/code/modules/mob/living/init_signals.dm +++ b/code/modules/mob/living/init_signals.dm @@ -38,6 +38,9 @@ SIGNAL_REMOVETRAIT(TRAIT_NODEATH), ), PROC_REF(update_succumb_action)) + RegisterSignal(src, COMSIG_MOVETYPE_FLAG_ENABLED, PROC_REF(on_movement_type_flag_enabled)) + RegisterSignal(src, COMSIG_MOVETYPE_FLAG_DISABLED, PROC_REF(on_movement_type_flag_disabled)) + ///Called when TRAIT_KNOCKEDOUT is added to the mob. /mob/living/proc/on_knockedout_trait_gain(datum/source) SIGNAL_HANDLER @@ -173,3 +176,13 @@ throw_alert("succumb", /atom/movable/screen/alert/succumb) else clear_alert("succumb") + +///From [element/movetype_handler/on_movement_type_trait_gain()] +/mob/living/proc/on_movement_type_flag_enabled(datum/source, trait) + SIGNAL_HANDLER + update_movespeed(FALSE) + +///From [element/movetype_handler/on_movement_type_trait_loss()] +/mob/living/proc/on_movement_type_flag_disabled(datum/source, trait) + SIGNAL_HANDLER + update_movespeed(FALSE) diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index f3e618c29e544..b98d460e29a1f 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -7,9 +7,6 @@ SEND_SIGNAL(src, COMSIG_LIVING_LIFE, delta_time, times_fired) - if((movement_type & FLYING) && !(movement_type & FLOATING)) //TODO: Better floating - float(on = TRUE) - if (notransform) return if(!loc) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index c63839b88e9ce..cf15ae9ef633e 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -25,6 +25,10 @@ //color correction RegisterSignal(src, COMSIG_MOVABLE_ENTERED_AREA, PROC_REF(apply_color_correction)) +/mob/living/ComponentInitialize() + . = ..() + AddElement(/datum/element/movetype_handler) + /mob/living/prepare_huds() ..() prepare_data_huds() @@ -928,10 +932,11 @@ /mob/living/proc/get_visible_name() return name -/mob/living/update_gravity(has_gravity, override) +/mob/living/update_gravity(has_gravity) . = ..() if(!SSticker.HasRoundStarted()) return + var/was_weightless = alerts["gravity"] && istype(alerts["gravity"], /atom/movable/screen/alert/weightless) if(has_gravity) if(has_gravity == 1) clear_alert("gravity") @@ -940,24 +945,12 @@ throw_alert("gravity", /atom/movable/screen/alert/veryhighgravity) else throw_alert("gravity", /atom/movable/screen/alert/highgravity) + if(was_weightless) + REMOVE_TRAIT(src, TRAIT_MOVE_FLOATING, NO_GRAVITY_TRAIT) else throw_alert("gravity", /atom/movable/screen/alert/weightless) - if(!override && !is_flying()) - float(!has_gravity) - -/mob/living/float(on) - if(throwing) - return - var/fixed = 0 - if(anchored || (buckled && buckled.anchored)) - fixed = 1 - if(on && !(movement_type & FLOATING) && !fixed) - animate(src, pixel_y = base_pixel_y + 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) - animate(pixel_y = base_pixel_y - 2, time = 10, loop = -1, flags = ANIMATION_RELATIVE) - setMovetype(movement_type | FLOATING) - else if(((!on || fixed) && (movement_type & FLOATING))) - animate(src, pixel_y = base_pixel_y + body_position_pixel_y_offset, time = 1 SECONDS) - setMovetype(movement_type & ~FLOATING) + if(!was_weightless) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, NO_GRAVITY_TRAIT) // The src mob is trying to strip an item from someone // Override if a certain type of mob should be behave differently when stripping items (can't, for example) @@ -1026,7 +1019,7 @@ var/matrix/reset_matrix = matrix() reset_matrix.Turn(-5) // Offset animation - animate(src, time = 1, pixel_x = rand(-2, 2), pixel_y = rand(-1, 1), easing = ELASTIC_EASING, flags = ANIMATION_RELATIVE) + animate(src, time = 1, pixel_x = rand(-2, 2), pixel_y = rand(-1, 1), easing = ELASTIC_EASING, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL) for (var/i in 1 to 4) var/dx = rand(-4, 2) var/dy = rand(-4, 2) @@ -1044,11 +1037,8 @@ var/amplitude = min(4, (jitteriness/100) + 1) var/pixel_x_diff = rand(-amplitude, amplitude) var/pixel_y_diff = rand(-amplitude/3, amplitude/3) - var/final_pixel_x = base_pixel_x + body_position_pixel_x_offset - var/final_pixel_y = base_pixel_y + body_position_pixel_y_offset - animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff , time = 2, loop = 6) - animate(pixel_x = final_pixel_x , pixel_y = final_pixel_y , time = 2) - setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure to restart it in next life(). + animate(src, pixel_x = pixel_x_diff, pixel_y = pixel_y_diff , time = 2, loop = 6, flags = ANIMATION_RELATIVE|ANIMATION_PARALLEL) + animate(pixel_x = -pixel_x_diff , pixel_y = -pixel_y_diff , time = 2, flags = ANIMATION_RELATIVE) /mob/living/proc/get_temperature(datum/gas_mixture/environment) var/loc_temp = environment ? environment.return_temperature() : T0C diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm index a34ecf210817b..3e02d5a4e4875 100644 --- a/code/modules/mob/living/living_defense.dm +++ b/code/modules/mob/living/living_defense.dm @@ -450,7 +450,6 @@ if(!used_item) used_item = get_active_held_item() ..() - setMovetype(movement_type & ~FLOATING) // If we were without gravity, the bouncing animation got stopped, so we make sure we restart the bouncing after the next movement. /mob/living/extrapolator_act(mob/living/user, obj/item/extrapolator/extrapolator, dry_run = FALSE) . = ..() diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm index 0517752446447..5a2ac317faab5 100644 --- a/code/modules/mob/living/simple_animal/constructs.dm +++ b/code/modules/mob/living/simple_animal/constructs.dm @@ -27,7 +27,8 @@ maxbodytemp = INFINITY healable = 0 faction = list("cult") - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE pressure_resistance = 100 unique_name = 1 AIStatus = AI_OFF //normal constructs don't have AI diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm index fe890e42c6f3e..841c87de1c948 100644 --- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm +++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm @@ -17,7 +17,7 @@ friendly_verb_continuous = "nudges" friendly_verb_simple = "nudge" density = FALSE - movement_type = FLYING + is_flying_animal = TRUE pass_flags = PASSTABLE | PASSMOB ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm index f83fc638d85e9..f80c42a3a5b47 100644 --- a/code/modules/mob/living/simple_animal/hostile/bees.dm +++ b/code/modules/mob/living/simple_animal/hostile/bees.dm @@ -44,7 +44,8 @@ density = FALSE mob_size = MOB_SIZE_TINY mob_biotypes = list(MOB_ORGANIC, MOB_BUG) - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE gold_core_spawnable = HOSTILE_SPAWN search_objects = 1 //have to find those plant trays! ventcrawler = VENTCRAWLER_ALWAYS diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm index a88869e9eedac..028284cc89c73 100644 --- a/code/modules/mob/living/simple_animal/hostile/carp.dm +++ b/code/modules/mob/living/simple_animal/hostile/carp.dm @@ -38,7 +38,8 @@ minbodytemp = 0 maxbodytemp = 1500 faction = list("carp") - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE pressure_resistance = 200 gold_core_spawnable = HOSTILE_SPAWN diff --git a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm index 38eff231950a5..152b4e66c8109 100644 --- a/code/modules/mob/living/simple_animal/hostile/eyeballs.dm +++ b/code/modules/mob/living/simple_animal/hostile/eyeballs.dm @@ -23,7 +23,7 @@ attack_verb_continuous = "blinks at" attack_verb_simple = "blink at" attack_sound = 'sound/weapons/pierce.ogg' - movement_type = FLYING + is_flying_animal = TRUE faction = list("spooky") del_on_death = TRUE diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm index e12c6e9011f98..185508e1af543 100644 --- a/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm +++ b/code/modules/mob/living/simple_animal/hostile/jungle/leaper.dm @@ -81,13 +81,17 @@ /obj/structure/leaper_bubble/Initialize(mapload) . = ..() - float(on = TRUE) QDEL_IN(src, 100) var/static/list/loc_connections = list( COMSIG_ATOM_ENTERED = PROC_REF(on_entered), ) AddElement(/datum/element/connect_loc, loc_connections) +/obj/structure/leaper_bubble/ComponentInitialize() + . = ..() + AddElement(/datum/element/movetype_handler) + ADD_TRAIT(src, TRAIT_MOVE_FLOATING, LEAPER_BUBBLE_TRAIT) + /obj/structure/leaper_bubble/Destroy() new /obj/effect/temp_visual/leaper_projectile_impact(get_turf(src)) playsound(src,'sound/effects/snap.ogg',50, 1, -1) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm index 1ae92cf7d81dc..fb555e75d5c83 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm @@ -58,6 +58,10 @@ Difficulty: Very Hard small_sprite_type = /datum/action/small_sprite/megafauna/colossus var/invulnerable_finale = FALSE +/mob/living/simple_animal/hostile/megafauna/colossus/Initialize() + . = ..() + ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) //we don't want this guy to float, messes up his animations. + /datum/action/innate/megafauna_attack/spiral_attack name = "Spiral Shots" icon_icon = 'icons/mob/actions/actions_items.dmi' @@ -709,7 +713,7 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box) friendly_verb_continuous = "mends" friendly_verb_simple = "mend" density = FALSE - movement_type = FLYING + is_flying_animal = TRUE pass_flags = PASSTABLE | PASSGRILLE | PASSMOB ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY @@ -724,7 +728,6 @@ GLOBAL_DATUM(blackbox, /obj/machinery/smartfridge/black_box) faction = list("neutral") del_on_death = TRUE unsuitable_atmos_damage = 0 - movement_type = FLYING minbodytemp = 0 maxbodytemp = 1500 obj_damage = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm index 90b948f3e0d15..2be5fe3585f48 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm @@ -12,7 +12,8 @@ light_range = 3 faction = list("mining", "boss") weather_immunities = list("lava","ash") - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE robust_searching = TRUE ranged_ignores_vision = TRUE stat_attack = HARD_CRIT diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm index 2617d977807f9..a7731786fb78a 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/basilisk.dm @@ -79,7 +79,7 @@ speak_emote = list("telepathically cries") attack_sound = 'sound/weapons/bladeslice.ogg' stat_attack = HARD_CRIT - movement_type = FLYING + is_flying_animal = TRUE robust_searching = 1 crusher_loot = /obj/item/crusher_trophy/watcher_wing loot = list() diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm index a2d214b92fa6d..7539e563cb096 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/curse_blob.dm @@ -6,7 +6,8 @@ icon_living = "curseblob" icon_aggro = "curseblob" mob_biotypes = list(MOB_SPIRIT) - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE move_to_delay = 5 vision_range = 20 aggro_vision_range = 20 diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm index 1f2e7a54654fb..a04f02f744f30 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/herald.dm @@ -195,7 +195,8 @@ icon_state = "herald_mirror" deathmessage = "shatters violently!" deathsound = 'sound/effects/glassbr1.ogg' - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE del_on_death = TRUE is_mirror = TRUE var/mob/living/simple_animal/hostile/asteroid/elite/herald/my_master = null diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm index f0af72f7c10dc..a226dac261e75 100644 --- a/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm +++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs/hivelord.dm @@ -72,7 +72,8 @@ speed = 3 maxHealth = 1 health = 1 - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE melee_damage = 2 attack_verb_continuous = "slashes" attack_verb_simple = "slash" diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm index 2e7f3ee0990d8..eb9b4b54450d8 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm @@ -27,7 +27,8 @@ environment_smash = ENVIRONMENT_SMASH_NONE ventcrawler = VENTCRAWLER_ALWAYS mob_size = MOB_SIZE_TINY - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE speak_emote = list("squeaks") var/max_co2 = 0 //to be removed once metastation map no longer use those for Sgt Araneus var/min_oxy = 0 diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm index f5149af8826f2..597842e87db3a 100644 --- a/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm +++ b/code/modules/mob/living/simple_animal/hostile/retaliate/ghost.dm @@ -30,7 +30,7 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 maxbodytemp = 1500 - movement_type = FLYING + is_flying_animal = TRUE pressure_resistance = 300 gold_core_spawnable = NO_SPAWN //too spooky for science var/ghost_hair_style diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 661717fe758a5..0f8acbb22532b 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -55,7 +55,8 @@ maxbodytemp = 1500 faction = list("carp") pressure_resistance = 200 - movement_type = FLYING | FLOATING // fly so you can move without gravity, float so no animation applies + is_flying_animal = TRUE + no_flying_animation = TRUE /// How much endlag using Wing Gust should apply. Each use of wing gust increments this, and it decreases over time. var/tiredness = 0 /// A multiplier to how much each use of wing gust should add to the tiredness variable. Set to 5 if the current rift is destroyed. diff --git a/code/modules/mob/living/simple_animal/hostile/syndicate.dm b/code/modules/mob/living/simple_animal/hostile/syndicate.dm index 19ff51965dd2b..ee81f657b0bb3 100644 --- a/code/modules/mob/living/simple_animal/hostile/syndicate.dm +++ b/code/modules/mob/living/simple_animal/hostile/syndicate.dm @@ -292,7 +292,8 @@ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0) minbodytemp = 0 mob_size = MOB_SIZE_TINY - movement_type = FLYING + is_flying_animal = TRUE + no_flying_animation = TRUE limb_destroyer = TRUE speak_emote = list("states") bubble_icon = "syndibot" diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm index fb9041a2c67f3..6b88ae9f0c990 100644 --- a/code/modules/mob/living/simple_animal/parrot.dm +++ b/code/modules/mob/living/simple_animal/parrot.dm @@ -67,7 +67,7 @@ friendly_verb_continuous = "grooms" friendly_verb_simple = "groom" mob_size = MOB_SIZE_SMALL - movement_type = FLYING + is_flying_animal = TRUE gold_core_spawnable = FRIENDLY_SPAWN chat_color = "#A6E398" mobchatspan = "curator" diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm index 8bc330969caaf..fc0933635fbed 100644 --- a/code/modules/mob/living/simple_animal/shade.dm +++ b/code/modules/mob/living/simple_animal/shade.dm @@ -30,7 +30,7 @@ status_flags = 0 faction = list("cult") status_flags = CANPUSH - movement_type = FLYING + is_flying_animal = TRUE loot = list(/obj/item/ectoplasm) del_on_death = TRUE initial_language_holder = /datum/language_holder/construct diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 89fab3bd63b31..22288e02d679e 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -99,6 +99,11 @@ var/dextrous = FALSE //If the creature has, and can use, hands var/dextrous_hud_type = /datum/hud/dextrous + ///If the creature should have an innate TRAIT_MOVE_FLYING trait added on init that is also toggled off/on on death/revival. + var/is_flying_animal = FALSE + //If the creature should play its bobbing up and down animation. + var/no_flying_animation + var/AIStatus = AI_ON //The Status of our AI, can be changed via toggle_ai(togglestatus) to AI_ON (On, usual processing), AI_IDLE (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever), AI_Z_OFF (Temporarily off due to nonpresence of players) var/can_have_ai = TRUE //once we have become sentient, we can never go back @@ -139,8 +144,12 @@ /mob/living/simple_animal/ComponentInitialize() . = ..() + if(no_flying_animation) + ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) if(dextrous) AddComponent(/datum/component/personal_crafting) + if(is_flying_animal) + ADD_TRAIT(src, TRAIT_MOVE_FLYING, ROUNDSTART_TRAIT) if(discovery_points) AddComponent(/datum/component/discoverable, discovery_points, get_discover_id = CALLBACK(src, PROC_REF(get_discovery_id))) @@ -159,6 +168,21 @@ return ..() +/mob/living/simple_animal/vv_edit_var(var_name, var_value) + . = ..() + switch(var_name) + if(NAMEOF(src, is_flying_animal)) + if(stat != DEAD) + if(!is_flying_animal) + REMOVE_TRAIT(src, TRAIT_MOVE_FLYING, ROUNDSTART_TRAIT) + else + ADD_TRAIT(src, TRAIT_MOVE_FLYING, ROUNDSTART_TRAIT) + if(NAMEOF(src, no_flying_animation)) + if(!no_flying_animation) + REMOVE_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) + else + ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) + /mob/living/simple_animal/examine(mob/user) . = ..() if(stat == DEAD) @@ -379,7 +403,6 @@ new i(loc) /mob/living/simple_animal/death(gibbed) - movement_type &= ~FLYING if(nest) nest.spawned_mobs -= src nest = null @@ -396,6 +419,10 @@ del_on_death = FALSE qdel(src) else + if(is_flying_animal) + REMOVE_TRAIT(src, TRAIT_MOVE_FLYING, ROUNDSTART_TRAIT) + if(no_flying_animation) + REMOVE_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) health = 0 icon_state = icon_dead if(flip_on_death) @@ -437,7 +464,10 @@ icon = initial(icon) icon_state = icon_living density = initial(density) - setMovetype(initial(movement_type)) + if(is_flying_animal) + ADD_TRAIT(src, TRAIT_MOVE_FLYING, ROUNDSTART_TRAIT) + if(no_flying_animation) + ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, ROUNDSTART_TRAIT) /mob/living/simple_animal/proc/make_babies() // <3 <3 <3 set waitfor = 0 diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm index 0fd5f65ae1d0e..34a30f59b160a 100644 --- a/code/modules/mob/living/ventcrawling.dm +++ b/code/modules/mob/living/ventcrawling.dm @@ -102,7 +102,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( A.pipe_vision_img.plane = ABOVE_HUD_PLANE client.images += A.pipe_vision_img pipes_shown += A.pipe_vision_img - setMovetype(movement_type | VENTCRAWLING) + ADD_TRAIT(src, TRAIT_MOVE_VENTCRAWLING, VENTCRAWLING_TRAIT) /mob/living/proc/remove_ventcrawl() @@ -110,7 +110,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list( for(var/image/current_image in pipes_shown) client.images -= current_image pipes_shown.len = 0 - setMovetype(movement_type & ~VENTCRAWLING) + REMOVE_TRAIT(src, TRAIT_MOVE_VENTCRAWLING, VENTCRAWLING_TRAIT) diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm index db43fd25105f0..b272ad7106b3e 100644 --- a/code/modules/mob/mob.dm +++ b/code/modules/mob/mob.dm @@ -1249,12 +1249,6 @@ /mob/proc/set_nutrition(var/change) //Seriously fuck you oldcoders. nutrition = max(0, change) -/mob/setMovetype(newval) //Set the movement type of the mob and update it's movespeed - . = ..() - if(isnull(.)) - return - update_movespeed(FALSE) - /mob/proc/update_equipment_speed_mods() var/speedies = equipped_speed_mods() if(!speedies) diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index f9c46bdedf7c4..209d811c6726c 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -520,13 +520,6 @@ message_admins("No ghosts were willing to take control of [ADMIN_LOOKUPFLW(M)])") return FALSE -///Is the mob a flying mob -/mob/proc/is_flying(mob/M = src) - if(M.movement_type & FLYING) - return 1 - else - return 0 - ///Clicks a random nearby mob with the source from this mob /mob/proc/click_random_mob() var/list/nearby_mobs = list() diff --git a/code/modules/recycling/disposal/holder.dm b/code/modules/recycling/disposal/holder.dm index 4ff466db0f06c..17c6872425561 100644 --- a/code/modules/recycling/disposal/holder.dm +++ b/code/modules/recycling/disposal/holder.dm @@ -16,6 +16,7 @@ var/destinationTag = NONE // changes if contains a delivery container var/tomail = FALSE // contains wrapped package var/hasmob = FALSE // contains a mob + var/unsorted = TRUE // have we been sorted yet? /obj/structure/disposalholder/Destroy() QDEL_NULL(gas) diff --git a/code/modules/recycling/disposal/pipe_sorting.dm b/code/modules/recycling/disposal/pipe_sorting.dm index 4aab953e83306..d9f771528482b 100644 --- a/code/modules/recycling/disposal/pipe_sorting.dm +++ b/code/modules/recycling/disposal/pipe_sorting.dm @@ -8,10 +8,17 @@ /obj/structure/disposalpipe/sorting/nextdir(obj/structure/disposalholder/H) var/sortdir = dpdir & ~(dir | turn(dir, 180)) - if(H.dir != sortdir) // probably came from the negdir - if(check_sorting(H)) // if destination matches filtered type... - return sortdir // exit through sortdirection - + var/input_direction = dir + // probably came from the negdir + if(H.dir == input_direction) + // if destination matches filtered type... + if(check_sorting(H)) + H.unsorted = FALSE + // exit through sortdirection + return sortdir + // If we are entering backwards, continue onwards + if (H.dir == turn(input_direction, 180)) + return H.dir // go with the flow to positive direction return dir @@ -23,7 +30,7 @@ // Mail sorting junction, uses package tags to sort objects. /obj/structure/disposalpipe/sorting/mail - desc = "An underfloor disposal pipe that sorts wrapped objects based on their destination tags." + desc = "An underfloor disposal pipe that sorts wrapped objects based on their destination tags. Objects passing through it become sorted." flip_type = /obj/structure/disposalpipe/sorting/mail/flip var/sortType = 0 // sortType is to be set in map editor. @@ -82,7 +89,7 @@ // Wrap sorting junction, sorts objects destined for the mail office mail table (tomail = 1) /obj/structure/disposalpipe/sorting/wrap name = "package sorting disposal pipe" - desc = "An underfloor disposal pipe which sorts wrapped and unwrapped objects." + desc = "An underfloor disposal pipe which sorts wrapped and unwrapped objects. Objects passing through it become sorted." flip_type = /obj/structure/disposalpipe/sorting/wrap/flip initialize_dirs = DISP_DIR_RIGHT | DISP_DIR_FLIP @@ -93,3 +100,19 @@ icon_state = "pipe-j2s" flip_type = /obj/structure/disposalpipe/sorting/wrap initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP + +// Unsorted junction, will divert things based on whether or not they have been sorted. +/obj/structure/disposalpipe/sorting/unsorted + name = "unsorted sorting disposal pipe" + desc = "An underfloor disposal pipe which sorts sorted and unsorted objects. Objects passing through it become sorted." + flip_type = /obj/structure/disposalpipe/sorting/unsorted/flip + initialize_dirs = DISP_DIR_RIGHT | DISP_DIR_FLIP + +/obj/structure/disposalpipe/sorting/unsorted/check_sorting(obj/structure/disposalholder/H) + return H.unsorted && (H.destinationTag > 1 || H.tomail) + +/obj/structure/disposalpipe/sorting/unsorted/flip + icon_state = "pipe-j2s" + flip_type = /obj/structure/disposalpipe/sorting/unsorted + initialize_dirs = DISP_DIR_LEFT | DISP_DIR_FLIP + diff --git a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm index ba123aba0cd44..091801c7079ca 100644 --- a/code/modules/shuttle/shuttle_creation/shuttle_creator.dm +++ b/code/modules/shuttle/shuttle_creation/shuttle_creator.dm @@ -424,8 +424,8 @@ GLOBAL_LIST_EMPTY(custom_shuttle_machines) //Machines that require updating (He to_chat(usr, "Warning, [place.mobile_port.name] is preventing designation in this region.") return FALSE if(!istype(t,/turf/open/floor/dock/drydock)) //Drydocks bypass the area check, but not the recursion check - var/static/list/drydock_types = typesof(/turf/open/floor/dock/drydock) - var/static/list/valid_area_types = typecacheof(list(/area/space, /area/lavaland/surface/outdoors, /area/asteroid/generated)) + var/static/list/drydock_types = typesof(/turf/open/floor/dock/drydock, /turf/open/floor/plating/grass, /turf/open/floor/plating/dirt/planetary, /turf/open/floor/plating/dirt/jungle/wasteland, /turf/open/floor/plating/beach/sand, /turf/open/floor/plating/asteroid/planetary) + var/static/list/valid_area_types = typecacheof(list(/area/space, /area/lavaland/surface/outdoors, /area/asteroid/generated, /area/asteroid/paradise/surface)) if(islist(t.baseturfs)) for(var/j in 0 to t.baseturfs.len - 1) //See if there's a drydock here that isn't being used by another shuttle var/path = t.baseturfs[t.baseturfs.len-j] diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm index eca93f0723ede..5edb0bbf147ad 100644 --- a/code/modules/surgery/organs/augments_chest.dm +++ b/code/modules/surgery/organs/augments_chest.dm @@ -182,7 +182,7 @@ var/turf/T = get_turf(owner) if(!T) // No more runtimes from being stuck in nullspace. return 0 - if(owner.is_flying() && owner.has_gravity()) + if((owner.movement_type & (FLOATING|FLYING)) && owner.has_gravity()) return 0 // Priority 1: use air from environment. var/datum/gas_mixture/environment = T.return_air() diff --git a/code/modules/vehicles/mecha/_mecha.dm b/code/modules/vehicles/mecha/_mecha.dm index e47b52a7e436e..7618e3f2eea92 100644 --- a/code/modules/vehicles/mecha/_mecha.dm +++ b/code/modules/vehicles/mecha/_mecha.dm @@ -128,8 +128,8 @@ ///TIme taken to leave the mech var/exit_delay = 2 SECONDS - ///Time you get slept for if you get forcible ejected by the mech exploding - var/destruction_sleep_duration = 2 SECONDS + ///Time you get knocked down for if you get forcible ejected by the mech exploding + var/destruction_knockdown_duration = 4 SECONDS ///Whether outside viewers can see the pilot inside var/enclosed = TRUE ///In case theres a different iconstate for AI/MMI pilot(currently only used for ripley) @@ -220,10 +220,23 @@ become_hearing_sensitive(trait_source = ROUNDSTART_TRAIT) -/obj/vehicle/sealed/mecha/Destroy() - for(var/ejectee in occupants) - mob_exit(ejectee, TRUE, TRUE) +//separate proc so that the ejection mechanism can be easily triggered by other things, such as admins +/obj/vehicle/sealed/mecha/proc/Eject() + for(var/mob/living/occupant as anything in occupants) + if(isAI(occupant)) + occupant.gib() //No wreck, no AI to recover + else + occupant.Stun(2 SECONDS) + occupant.Knockdown(destruction_knockdown_duration) + occupant.throwing = TRUE //This is somewhat hacky, but is the best option available to avoid chasm detection for the split second between the next two lines + occupant.forceMove(get_turf(loc)) + occupant.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(5, 8),rand(5, 8)) //resets the throwing variable above. Random values are independant on purpose to give variance to damage on wallslams and the distance the occupant is ejected. + occupant.visible_message("[occupant] is forcefully ejected from the mech!", "You are forcefully ejected from the mech!", null, COMBAT_MESSAGE_RANGE) + playsound(src, 'sound/machines/scanbuzz.ogg', 60, FALSE) + playsound(src, 'sound/vehicles/carcannon1.ogg', 150, TRUE) +/obj/vehicle/sealed/mecha/Destroy() + Eject() if(LAZYLEN(equipment)) for(var/obj/item/mecha_parts/mecha_equipment/equip as anything in equipment) equip.detach(loc) @@ -246,12 +259,7 @@ /obj/vehicle/sealed/mecha/obj_destruction() loc.assume_air(cabin_air) air_update_turf(FALSE, FALSE) - for(var/mob/living/occupant as anything in occupants) - if(isAI(occupant)) - occupant.gib() //No wreck, no AI to recover - continue - mob_exit(occupant, FALSE, TRUE) - occupant.SetSleeping(destruction_sleep_duration) + Eject() return ..() /obj/vehicle/sealed/mecha/update_icon_state() diff --git a/code/modules/vehicles/mecha/combat/combat.dm b/code/modules/vehicles/mecha/combat/combat.dm index af78cadb9b7df..1d629c7ddcd0d 100644 --- a/code/modules/vehicles/mecha/combat/combat.dm +++ b/code/modules/vehicles/mecha/combat/combat.dm @@ -4,7 +4,7 @@ internal_damage_threshold = 50 armor = list(MELEE = 30, BULLET = 30, LASER = 15, ENERGY = 20, BOMB = 20, BIO = 0, RAD = 0, FIRE = 100, ACID = 100, STAMINA = 0, BLEED = 0) mouse_pointer = 'icons/mecha/mecha_mouse.dmi' - destruction_sleep_duration = 40 + destruction_knockdown_duration = 8 SECONDS exit_delay = 40 /obj/vehicle/sealed/mecha/combat/restore_equipment() diff --git a/code/modules/vehicles/mecha/combat/gygax.dm b/code/modules/vehicles/mecha/combat/gygax.dm index 9adf74ddd5470..afc9545af683b 100644 --- a/code/modules/vehicles/mecha/combat/gygax.dm +++ b/code/modules/vehicles/mecha/combat/gygax.dm @@ -30,7 +30,7 @@ internals_req_access = list(ACCESS_SYNDICATE) wreckage = /obj/structure/mecha_wreckage/gygax/dark max_equip = 5 - destruction_sleep_duration = 20 + destruction_knockdown_duration = 2 SECONDS //Syndi mechs get reduced knockdown /obj/vehicle/sealed/mecha/combat/gygax/dark/loaded/Initialize(mapload) . = ..() diff --git a/code/modules/vehicles/mecha/combat/marauder.dm b/code/modules/vehicles/mecha/combat/marauder.dm index 7a22dfdb54c44..b90dcbdd05034 100644 --- a/code/modules/vehicles/mecha/combat/marauder.dm +++ b/code/modules/vehicles/mecha/combat/marauder.dm @@ -74,7 +74,7 @@ internals_req_access = list(ACCESS_SYNDICATE) wreckage = /obj/structure/mecha_wreckage/mauler max_equip = 6 - destruction_sleep_duration = 20 + destruction_knockdown_duration = 2 SECONDS //Syndi mechs get reduced knockdown /obj/vehicle/sealed/mecha/combat/marauder/mauler/Initialize(mapload) . = ..() diff --git a/code/modules/vending/cigarette.dm b/code/modules/vending/cigarette.dm index 11cb5dc2bc990..bdcbddde25053 100644 --- a/code/modules/vending/cigarette.dm +++ b/code/modules/vending/cigarette.dm @@ -9,6 +9,7 @@ /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, + /obj/item/storage/fancy/cigarettes/dromedaryco = 3, /obj/item/storage/box/matches = 10, /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) diff --git a/html/changelog.html b/html/changelog.html index 814f6d1cb930e..4cffda762b330 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,69 @@ -->