diff --git a/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm b/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm index 4ce5f4757da..8a2a232d427 100644 --- a/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm +++ b/_maps/bubber/automapper/templates/lavaland/lavaland_smithy.dmm @@ -17,16 +17,6 @@ /area/mine/blacksmith) "n" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/stack/sheet/mineral/coal/ten, -/obj/item/forging/billow, -/obj/item/forging/hammer, -/obj/item/forging/tongs, -/obj/item/stack/sheet/bronze/thirty, -/obj/item/stack/sheet/iron/twenty, -/obj/item/stack/rods/twentyfive, -/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith, -/obj/item/clothing/suit/leatherapron, -/obj/structure/cargo_shelf, /obj/machinery/airalarm/directional/east, /turf/open/floor/stone, /area/mine/blacksmith) @@ -82,8 +72,8 @@ /area/mine/blacksmith) "O" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/space_heater, /obj/machinery/camera/autoname/mine/directional/east, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/open/floor/stone, /area/mine/blacksmith) "P" = ( @@ -105,9 +95,26 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/stone, /area/mine/blacksmith) +"U" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/wooden, +/obj/item/clothing/suit/leatherapron, +/obj/item/clothing/suit/toggle/jacket/zubber/bomber/cargo/smith, +/obj/item/stack/rods/twentyfive, +/obj/item/stack/sheet/iron/twenty, +/obj/item/stack/sheet/bronze/thirty, +/obj/item/forging/tongs, +/obj/item/forging/hammer, +/obj/item/forging/billow, +/obj/item/stack/sheet/mineral/coal/ten, +/turf/open/floor/stone, +/area/mine/blacksmith) "V" = ( /obj/effect/decal/cleanable/dirt, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/space_heater, /turf/open/floor/stone, /area/mine/blacksmith) @@ -133,7 +140,7 @@ L V l y -C +U "} (5,1,1) = {" O diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index 090b677fd34..81a2a277ee7 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -10964,6 +10964,13 @@ /obj/structure/cable, /turf/open/floor/iron/white, /area/station/science/xenobiology/control) +"cfi" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 1 + }, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "cfj" = ( /obj/structure/window/spawner/directional/north, /obj/structure/window/spawner/directional/west, @@ -12752,9 +12759,6 @@ }, /area/station/hallway/primary/port) "cvq" = ( -/obj/machinery/medical_kiosk{ - pixel_x = -3 - }, /obj/effect/turf_decal/bot, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 @@ -12762,6 +12766,7 @@ /obj/structure/disposalpipe/segment{ dir = 6 }, +/obj/machinery/self_actualization_device, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "cvt" = ( @@ -16920,7 +16925,10 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_y = -32; - pixel_x = 0 + pixel_x = 0; + icon_state = "button-warning"; + req_access = list("medical"); + skin = "-warning" }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) @@ -19349,10 +19357,13 @@ /turf/open/floor/iron/smooth, /area/station/maintenance/shuttle_maint_bay) "dHb" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/wall_healer/directional/south, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 8; + alpha = 160 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "dHc" = ( @@ -21261,7 +21272,6 @@ /obj/structure/railing{ dir = 1 }, -/obj/structure/chair, /turf/open/floor/iron/white/side, /area/station/medical/medbay/lobby) "eaR" = ( @@ -25797,12 +25807,11 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "eSV" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/bot, -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/machinery/firealarm/directional/east, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, +/obj/effect/turf_decal/trimline/purple/filled/line{ dir = 6 }, -/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "eSY" = ( @@ -28775,11 +28784,6 @@ dir = 8 }, /area/station/hallway/secondary/entry) -"fwb" = ( -/obj/machinery/door/firedoor, -/obj/structure/sign/departments/exam_room/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "fwc" = ( /obj/effect/turf_decal/siding/wood{ dir = 1 @@ -32827,10 +32831,12 @@ /area/station/service/hydroponics) "glI" = ( /obj/effect/turf_decal/bot, -/obj/item/kirbyplants/random, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 5 }, +/obj/machinery/medical_kiosk{ + pixel_x = -3 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "glJ" = ( @@ -33009,13 +33015,11 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/side{ - dir = 5 +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 }, +/turf/open/floor/iron/white/smooth_edge, /area/station/medical/medbay/lobby) "gnb" = ( /obj/effect/decal/cleanable/dirt{ @@ -34413,10 +34417,11 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 1 }, -/obj/machinery/newscaster/directional/north, /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "gAF" = ( @@ -38230,6 +38235,7 @@ "hnf" = ( /obj/effect/turf_decal/trimline/blue/filled/corner, /obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "hng" = ( @@ -38705,7 +38711,6 @@ /obj/structure/railing/corner{ dir = 1 }, -/obj/structure/chair, /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 4 }, @@ -42602,14 +42607,17 @@ /area/station/medical/medbay/central) "ify" = ( /obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/blue/filled/corner, /obj/effect/turf_decal/tile/neutral{ dir = 8 }, /obj/effect/turf_decal/tile/neutral{ dir = 1 }, -/turf/open/floor/iron/white/side{ +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, /area/station/medical/medbay/lobby) @@ -63043,6 +63051,9 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/cable, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "mah" = ( @@ -64672,7 +64683,14 @@ }, /obj/machinery/light/directional/east, /obj/structure/disposalpipe/segment, -/obj/machinery/firealarm/directional/east, +/obj/machinery/button/door/directional/east{ + icon_state = "button-warning"; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + skin = "-warning" + }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "msf" = ( @@ -65387,9 +65405,8 @@ }, /area/station/service/theater) "mzN" = ( -/obj/machinery/door/airlock/security/glass{ - id_tag = "meddoor"; - name = "Medical Cell" +/obj/machinery/door/airlock/security{ + name = "Medbay Security Post" }, /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/blue/filled/warning, @@ -66895,6 +66912,15 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/mineral/plastitanium, /area/station/science/robotics/mechbay) +"mOP" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) "mOS" = ( /obj/machinery/atmospherics/components/binary/pump, /obj/structure/cable, @@ -73915,13 +73941,16 @@ /turf/open/floor/iron, /area/station/maintenance/solars/starboard/fore) "ogN" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/station/medical/medbay/lobby) "ogR" = ( /obj/effect/turf_decal/tile/neutral{ @@ -78230,21 +78259,6 @@ }, /turf/open/floor/iron/white, /area/station/science/lab) -"oVV" = ( -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 4 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 8 - }, -/obj/effect/turf_decal/tile/neutral{ - dir = 1 - }, -/turf/open/floor/iron/white/side{ - dir = 4 - }, -/area/station/medical/medbay/lobby) "oVW" = ( /obj/machinery/computer/bank_machine{ dir = 4 @@ -81652,6 +81666,12 @@ }, /obj/machinery/light_switch/directional/north, /obj/machinery/light/directional/north, +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security"); + pixel_x = -14 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "pFN" = ( @@ -89061,9 +89081,6 @@ /obj/effect/turf_decal/trimline/blue/filled/corner{ dir = 8 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white/side{ dir = 6 @@ -93173,9 +93190,11 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white/side{ - dir = 4 +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 4; + alpha = 160 }, +/turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "rNe" = ( /obj/machinery/door/airlock/maintenance, @@ -109199,7 +109218,7 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/machinery/light_switch/directional/west, +/obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "uQl" = ( @@ -111782,6 +111801,9 @@ /obj/structure/disposalpipe/segment{ dir = 5 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "vqq" = ( @@ -112580,7 +112602,11 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white/side{ +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ dir = 4 }, /area/station/medical/medbay/lobby) @@ -119343,6 +119369,14 @@ dir = 8 }, /obj/structure/disposalpipe/segment, +/obj/machinery/button/door/directional/east{ + icon_state = "button-warning"; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + skin = "-warning" + }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "wJg" = ( @@ -119876,11 +119910,11 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "wPf" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/light/floor, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "wPg" = ( @@ -120474,6 +120508,11 @@ /obj/machinery/light_switch/directional/east, /turf/open/floor/wood, /area/station/security/prison/rec) +"wUW" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/light/floor, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "wUX" = ( /obj/structure/rack, /obj/effect/turf_decal/bot, @@ -226258,7 +226297,7 @@ bCf bCf hHN hHN -oVV +ify rNd vxi rNd @@ -226515,11 +226554,11 @@ dUv isi aZP qun -ksY +cfi vNX oYi vNX -bst +wUW bql exf frF @@ -228812,7 +228851,7 @@ tEi axQ ext shb -tCr +mOP ksJ tYA smS @@ -229326,7 +229365,7 @@ xRw tcL pHf kHj -tCr +mOP rXC vUt eSR @@ -229602,7 +229641,7 @@ tRa atX hEA kFt -fwb +hEA atX tRa tRa diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index fb88f89e2d8..6db5ba250aa 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -19283,10 +19283,6 @@ c_tag = "Medbay North"; network = list("ss13","medbay") }, -/obj/machinery/newscaster/directional/east{ - pixel_x = 0; - pixel_y = -30 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ alpha = 160 }, @@ -19294,6 +19290,24 @@ /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, /obj/effect/turf_decal/trimline/blue/filled/mid_joiner, /obj/effect/turf_decal/trimline/white/mid_joiner, +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_y = -26; + req_access = list("medical"); + icon_state = "button-warning"; + skin = "-warning" + }, +/obj/machinery/button/door{ + desc = "A remote control switch for the medbay foyer."; + id = "MedbayAft"; + name = "Side Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_y = -37; + req_access = list("medical") + }, /turf/open/floor/iron/white/smooth_edge, /area/station/medical/medbay/central) "brb" = ( @@ -21184,7 +21198,9 @@ normaldoorcontrol = 1; pixel_y = 7; req_access = list("medical"); - pixel_x = -24 + pixel_x = -24; + skin = "-warning"; + icon_state = "button-warning" }, /obj/effect/landmark/start/depsec/medical, /turf/open/floor/iron/dark, @@ -21747,6 +21763,13 @@ dir = 8 }, /obj/effect/landmark/start/depsec/medical, +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security"); + pixel_x = -8; + pixel_y = 22 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "bwH" = ( @@ -42922,6 +42945,8 @@ /obj/effect/turf_decal/trimline/white/mid_joiner{ dir = 1 }, +/obj/machinery/requests_console/auto_name/directional/north, +/obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -46771,8 +46796,8 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4{ dir = 4 }, -/obj/machinery/door/airlock/security/glass{ - name = "Security Office" +/obj/machinery/door/airlock/security{ + name = "Medbay Security Post" }, /obj/effect/mapping_helpers/airlock/access/any/security/general, /turf/open/floor/iron/dark, @@ -57694,6 +57719,11 @@ "lYP" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating, /area/station/medical/treatment_center) "lZo" = ( @@ -59656,7 +59686,9 @@ name = "Medbay Doors Control"; normaldoorcontrol = 1; pixel_y = -26; - req_access = list("medical") + req_access = list("medical"); + icon_state = "button-warning"; + skin = "-warning" }, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -64697,6 +64729,7 @@ /obj/effect/turf_decal/trimline/white/line{ dir = 6 }, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler, /turf/open/floor/iron/white/smooth_corner{ dir = 1 }, @@ -70559,6 +70592,11 @@ "rQe" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) "rQi" = ( @@ -75588,6 +75626,16 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/processing) +"uay" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) "uaA" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/line, @@ -120189,7 +120237,7 @@ bfF bfF vbw ruy -rQe +uay bvj bwG gGW @@ -120703,7 +120751,7 @@ sdT ptB bpN bCS -rQe +uay btg bDR xjt diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index e01009956ec..c96cf44ced9 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1738,15 +1738,12 @@ /turf/open/floor/iron/dark, /area/station/commons/locker) "aBN" = ( -/obj/structure/table, -/obj/item/storage/box/bodybags{ - pixel_y = 5 - }, -/obj/item/pen, /obj/machinery/light/directional/south, /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, +/obj/effect/turf_decal/tile/purple/opposingcorners, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "aCi" = ( @@ -3525,7 +3522,6 @@ /turf/open/floor/iron, /area/station/hallway/primary/central/fore) "bjk" = ( -/obj/machinery/airalarm/directional/north, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -3535,6 +3531,14 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/machinery/button/door/directional/north{ + icon_state = "button-warning"; + id = "medbay_front_door"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + skin = "-warning" + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "bjz" = ( @@ -4180,7 +4184,6 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 4 }, -/obj/machinery/firealarm/directional/south, /obj/effect/turf_decal/stripes/corner, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, @@ -5705,6 +5708,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "bXS" = ( @@ -7395,9 +7401,11 @@ "cvL" = ( /obj/machinery/button/door/directional/south{ id = "medbay_front_door"; - name = "Medbay Doors Toggle"; + name = "Medbay Doors Control"; normaldoorcontrol = 1; - req_access = list("medical") + req_access = list("medical"); + icon_state = "button-warning"; + skin = "-warning" }, /obj/machinery/computer/crew{ dir = 4 @@ -8506,6 +8514,9 @@ name = "Medbay" }, /obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "cTN" = ( @@ -10666,7 +10677,9 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/effect/turf_decal/caution/stand_clear, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) @@ -15304,6 +15317,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "fgA" = ( @@ -18384,6 +18400,12 @@ dir = 4 }, /obj/machinery/computer/security/telescreen/cmo/directional/south, +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security"); + pixel_x = -11 + }, /turf/open/floor/iron/dark, /area/station/security/checkpoint/medical) "fZk" = ( @@ -20056,6 +20078,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/medical/medbay/central) "gBd" = ( @@ -20915,7 +20940,10 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, +/turf/open/floor/iron/dark/smooth_edge, /area/station/medical/medbay/lobby) "gOo" = ( /obj/structure/sign/directions/evac{ @@ -26264,6 +26292,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/grass, /area/station/medical/psychology) +"iue" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) "iug" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/plasma_input{ dir = 1 @@ -32017,6 +32054,7 @@ /obj/effect/turf_decal/box, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/anticorner/contrasted, +/obj/machinery/firealarm/directional/east, /turf/open/floor/iron/showroomfloor, /area/station/medical/exam_room) "knR" = ( @@ -32130,13 +32168,18 @@ id = "emmd"; name = "Emergency Medical Lockdown Shutters" }, -/obj/effect/turf_decal/caution/stand_clear, /obj/machinery/door/firedoor, /obj/structure/disposalpipe/segment{ dir = 4 }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/corner{ + alpha = 160 + }, +/obj/effect/turf_decal/caution/stand_clear{ + dir = 4 + }, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "kqs" = ( @@ -36108,7 +36151,7 @@ "lAu" = ( /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/door/airlock/security/glass{ +/obj/machinery/door/airlock/security{ name = "Medbay Security Post" }, /obj/structure/cable, @@ -38324,6 +38367,7 @@ /obj/item/storage/box/bandages{ pixel_y = 5 }, +/obj/item/storage/box/bodybags, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "mlB" = ( @@ -39449,18 +39493,14 @@ /obj/effect/turf_decal/stripes/corner{ dir = 4 }, -/obj/machinery/button/door/directional/north{ - id = "medbay_front_door"; - name = "Medbay Doors Toggle"; - normaldoorcontrol = 1; - req_access = list("medical") - }, /obj/effect/turf_decal/tile/blue{ dir = 1 }, /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/auto_name/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "mEH" = ( @@ -39745,7 +39785,13 @@ /obj/effect/turf_decal/stripes/corner, /obj/structure/disposalpipe/segment, /obj/effect/mapping_helpers/airlock/access/all/medical/pharmacy, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1; + alpha = 160 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 1 + }, /area/station/medical/pharmacy) "mJo" = ( /obj/structure/disposalpipe/junction/flip{ @@ -40535,6 +40581,16 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"mWc" = ( +/obj/effect/turf_decal/tile/blue/opposingcorners, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/lobby) "mWg" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank, @@ -53172,6 +53228,15 @@ /obj/effect/spawner/random/clothing/costume, /turf/open/floor/plating, /area/station/maintenance/starboard) +"rkb" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 1; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) "rkn" = ( /obj/item/stack/cable_coil, /turf/open/misc/asteroid/airless, @@ -55835,6 +55900,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/airalarm/directional/south, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/central) "rZK" = ( @@ -57596,7 +57662,13 @@ dir = 4 }, /obj/effect/landmark/navigate_destination/med, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, /area/station/hallway/primary/central/fore) "sCr" = ( /obj/structure/reagent_dispensers/fueltank, @@ -58820,6 +58892,11 @@ /area/station/medical/chemistry) "sSJ" = ( /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 4; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) "sSN" = ( @@ -62242,7 +62319,13 @@ /obj/machinery/door/airlock/public/glass{ name = "Medbay" }, -/turf/open/floor/iron/dark, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/turf/open/floor/iron/dark/smooth_edge{ + dir = 8 + }, /area/station/hallway/primary/central/fore) "tWg" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -67900,6 +67983,14 @@ /obj/machinery/light/directional/east, /turf/open/floor/plating/airless, /area/station/hallway/secondary/entry) +"vJn" = ( +/obj/effect/spawner/structure/window, +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 8; + alpha = 160 + }, +/turf/open/floor/plating, +/area/station/hallway/primary/central/fore) "vJv" = ( /obj/structure/extinguisher_cabinet/directional/north, /obj/machinery/component_printer, @@ -74051,6 +74142,9 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "xEB" = ( @@ -96497,9 +96591,9 @@ jTu wEJ kRu rFt -sSJ +iue lAu -sSJ +iue rFt owm jrs @@ -97010,7 +97104,7 @@ xvW nbg mbc rUP -sSJ +rkb lfQ mHm rVp @@ -98551,7 +98645,7 @@ ciA krM xvW fXm -nes +mWc uTM eyA eIW @@ -99065,7 +99159,7 @@ mFQ wQc cXZ hdo -hdo +vJn tWe sCa hdo diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 7e956728f01..45df5acee00 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -1160,8 +1160,11 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white/smooth_edge{ - dir = 8 +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_corner{ + dir = 4 }, /area/station/medical/medbay/lobby) "arG" = ( @@ -2104,10 +2107,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/engine, /area/station/security/armory) -"aFv" = ( -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white/smooth_large, -/area/station/medical/medbay/lobby) "aFy" = ( /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 9 @@ -8450,10 +8449,8 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/window/reinforced/spawner/directional/west{ - pixel_x = -4 - }, /obj/structure/disposalpipe/segment, +/obj/machinery/wall_healer/directional/west, /turf/open/floor/iron/white/smooth_edge{ dir = 4 }, @@ -10555,6 +10552,16 @@ /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"dgR" = ( +/obj/structure/cable, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutters"; + dir = 4 + }, +/turf/open/floor/plating/airless, +/area/station/security/checkpoint/medical) "dhd" = ( /obj/machinery/camera/directional/north{ c_tag = "Atmospherics - Plasma Cell"; @@ -11530,6 +11537,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/central) +"dvc" = ( +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, +/obj/machinery/duct, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/medbay/central) "dve" = ( /obj/structure/rack, /obj/item/clothing/head/utility/welding, @@ -18083,9 +18099,6 @@ "fmM" = ( /obj/structure/table/reinforced/rglass, /obj/machinery/door/firedoor, -/obj/structure/window/reinforced/spawner/directional/south{ - pixel_y = -4 - }, /obj/item/reagent_containers/cup/bottle/multiver{ pixel_x = 6 }, @@ -25354,11 +25367,12 @@ "htb" = ( /obj/structure/rack, /obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/box/white{ - color = "#52B4E9" - }, /obj/machinery/light/cold/directional/south, /obj/machinery/incident_display/disease/directional/south, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 5; + alpha = 160 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -25390,6 +25404,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 5 }, +/obj/structure/sign/warning/no_smoking/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "htz" = ( @@ -27003,7 +27018,6 @@ /turf/open/floor/iron/smooth, /area/station/cargo/miningdock) "hQx" = ( -/obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/public/glass{ dir = 4; name = "Arrivals" @@ -27314,6 +27328,9 @@ "hTP" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "hTW" = ( @@ -29102,10 +29119,16 @@ /turf/open/floor/wood/large, /area/station/command/heads_quarters/captain) "itW" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 5 +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 }, -/turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "iud" = ( /obj/structure/cable, @@ -29231,6 +29254,10 @@ "ivR" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating/airless, /area/station/security/checkpoint/medical) "ivS" = ( @@ -30114,7 +30141,6 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, -/obj/machinery/duct, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -32470,6 +32496,9 @@ /turf/open/floor/plating, /area/station/engineering/supermatter) "jrm" = ( +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "jrn" = ( @@ -32697,13 +32726,6 @@ /obj/structure/cable, /turf/open/floor/iron/smooth_large, /area/station/hallway/secondary/construction) -"jtG" = ( -/obj/structure/flora/ocean/glowweed, -/obj/effect/spawner/liquids_spawner{ - reagent_list = list(/datum/reagent/water=600) - }, -/turf/open/misc/asteroid, -/area/station/medical/medbay/lobby) "jtH" = ( /obj/machinery/door/airlock/maintenance{ name = "Morgue Maintenance" @@ -34389,13 +34411,11 @@ /turf/open/floor/plating, /area/station/security/prison/garden) "jPU" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/smooth_corner{ - dir = 8 +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 }, +/turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "jQm" = ( /obj/effect/turf_decal/trimline/yellow/filled/corner{ @@ -34735,11 +34755,17 @@ /turf/open/floor/iron/cafeteria, /area/station/service/cafeteria) "jWg" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 6 - }, /obj/effect/landmark/start/hangover, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/station/medical/medbay/lobby) "jWo" = ( /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ @@ -35395,8 +35421,10 @@ }, /area/station/science/xenobiology) "kgj" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/trimline/purple/corner{ + alpha = 160 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -35608,6 +35636,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/corner{ + dir = 8; + alpha = 160 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "kiZ" = ( @@ -39004,6 +39036,10 @@ /obj/structure/disposalpipe/segment, /obj/structure/cable, /obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating/airless, /area/station/security/checkpoint/medical) "lbM" = ( @@ -45658,8 +45694,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/machinery/requests_console/directional/south, /obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/auto_name/directional/south, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -46781,15 +46817,22 @@ /turf/closed/wall/r_wall/rust, /area/station/engineering/atmos) "nhi" = ( -/obj/structure/window/reinforced/spawner/directional/east{ - pixel_x = 4 - }, /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, +/obj/machinery/button/door/directional/east{ + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + pixel_x = 21; + pixel_y = 10; + icon_state = "button-warning"; + req_access = list("medical"); + skin = "-warning" + }, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -48470,10 +48513,10 @@ /area/station/engineering/atmos/hfr_room) "nFV" = ( /obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/status_display/ai/directional/north, /obj/effect/turf_decal/bot, /obj/machinery/computer/records/medical, /obj/machinery/light/cold/directional/north, +/obj/machinery/airalarm/directional/north, /turf/open/floor/iron/freezer, /area/station/security/checkpoint/medical) "nGa" = ( @@ -50612,7 +50655,10 @@ id = "MedbayFoyer"; name = "Medbay Doors Control"; normaldoorcontrol = 1; - pixel_x = 5 + pixel_x = 5; + req_access = list("medical"); + icon_state = "button-warning"; + skin = "-warning" }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) @@ -54838,15 +54884,15 @@ }, /area/station/science/research) "ppb" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning{ - dir = 10 - }, /obj/structure/closet/firecloset/wall{ pixel_x = -32 }, /obj/effect/turf_decal/trimline/white/end{ dir = 4 }, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "ppf" = ( @@ -55519,7 +55565,20 @@ pixel_x = 5; pixel_y = 3 }, -/obj/machinery/airalarm/directional/east, +/obj/machinery/button/door/directional/east{ + icon_state = "button-warning"; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + skin = "-warning" + }, +/obj/machinery/button/door/directional/east{ + pixel_y = -9; + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security") + }, /turf/open/floor/iron/freezer, /area/station/security/checkpoint/medical) "pzY" = ( @@ -61788,7 +61847,16 @@ /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 }, -/obj/structure/sink/directional/east, +/obj/machinery/button/door/directional/west{ + pixel_y = 11; + icon_state = "button-warning"; + id = "MedbayFoyer"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + skin = "-warning"; + req_access = list("medical") + }, +/obj/machinery/duct, /turf/open/floor/iron/white/smooth_edge{ dir = 4 }, @@ -63138,13 +63206,10 @@ /turf/open/floor/pod/dark, /area/station/service/chapel) "rFl" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ +/obj/effect/turf_decal/trimline/purple/filled/line{ dir = 4 }, -/obj/structure/chair{ - dir = 8 - }, -/obj/effect/landmark/start/assistant, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -65778,6 +65843,10 @@ pixel_x = -4 }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1; + alpha = 160 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "suv" = ( @@ -81388,6 +81457,10 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/cmo) +"wCC" = ( +/obj/machinery/door/firedoor, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/lobby) "wCL" = ( /obj/structure/window/spawner/directional/south, /obj/structure/window/spawner/directional/west, @@ -81924,6 +81997,15 @@ dir = 8 }, /area/station/cargo/storage) +"wJU" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_large, +/area/station/medical/medbay/lobby) "wKa" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82097,6 +82179,10 @@ /area/station/service/library/abandoned) "wLP" = ( /obj/effect/turf_decal/trimline/blue/filled/warning, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1; + alpha = 160 + }, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -82840,8 +82926,7 @@ /obj/effect/turf_decal/trimline/blue/filled/warning{ dir = 9 }, -/obj/structure/sign/warning/no_smoking/directional/north, -/obj/item/kirbyplants/random, +/obj/structure/sink/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "wXR" = ( @@ -116033,8 +116118,8 @@ cnC abF lZg qxO -ivR -ivR +dgR +dgR qxO ore uGJ @@ -116291,7 +116376,7 @@ dyZ yae cnC wXr -rjQ +dvc rjQ nkQ qtZ @@ -117829,7 +117914,7 @@ mAQ puL aXQ fmM -jtG +dfF dqZ dfF iNT @@ -118345,7 +118430,7 @@ onu nfb hKr wLP -aFv +wCC dZv awZ oBA @@ -118852,7 +118937,7 @@ dLw cnC uai xRC -sSx +wJU sSx sCj vHW @@ -120142,7 +120227,7 @@ uTt toS oMY dfF -aFv +wCC hQx fDn fDn diff --git a/_maps/map_files/biodome/biodome.dmm b/_maps/map_files/biodome/biodome.dmm index c8183fe6f09..ed60d9b04c9 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -1097,7 +1097,7 @@ /turf/closed/wall/r_wall, /area/station/maintenance/fore/lesser) "asB" = ( -/obj/machinery/door/airlock/security/glass{ +/obj/machinery/door/airlock/security{ name = "Medbay Security Post" }, /obj/structure/cable, @@ -4306,7 +4306,8 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/obj/structure/sign/eyechart/directional/east, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/auto_name/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/central) "bxk" = ( @@ -6341,13 +6342,11 @@ /area/station/biodome/fore) "chZ" = ( /obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/item/kirbyplants/random, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/machinery/airalarm/directional/west, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, +/obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "cin" = ( @@ -15335,7 +15334,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge, /area/station/medical/medbay/lobby) "fky" = ( /obj/structure/chair/office{ @@ -15655,7 +15657,10 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge, /area/station/medical/medbay/lobby) "frh" = ( /obj/structure/closet/emcloset, @@ -16225,6 +16230,11 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security") + }, /turf/open/floor/iron/dark/smooth_large, /area/station/security/checkpoint/medical) "fAu" = ( @@ -18028,6 +18038,9 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "gfL" = ( @@ -26539,6 +26552,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "jiG" = ( @@ -29257,7 +29273,9 @@ name = "Medbay Foyer Doors"; normaldoorcontrol = 1; pixel_x = -6; - pixel_y = -26 + pixel_y = -26; + skin = "-warning"; + icon_state = "button-warning" }, /obj/machinery/light_switch/directional/south{ pixel_x = 6 @@ -29598,7 +29616,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/station/medical/medbay/lobby) "kle" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31960,7 +31984,13 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 8 + }, /area/station/medical/medbay/lobby) "kYo" = ( /obj/structure/cable, @@ -33498,6 +33528,10 @@ "lym" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating, /area/station/medical/medbay/lobby) "lyp" = ( @@ -39413,6 +39447,10 @@ "nwo" = ( /obj/machinery/door/firedoor, /obj/structure/cable, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 8; + alpha = 160 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "nwq" = ( @@ -58229,6 +58267,11 @@ "tPg" = ( /obj/effect/spawner/structure/window/reinforced, /obj/structure/cable, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, /turf/open/floor/plating, /area/station/security/checkpoint/medical) "tPt" = ( @@ -59998,6 +60041,9 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "uAp" = ( @@ -60166,7 +60212,13 @@ /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, /area/station/medical/medbay/lobby) "uCX" = ( /obj/structure/chair/wood/wings{ @@ -63793,7 +63845,10 @@ /obj/machinery/button/door/directional/east{ id = "MedbayFoyer"; name = "Medbay Foyer Doors"; - normaldoorcontrol = 1 + normaldoorcontrol = 1; + icon_state = "button-warning"; + skin = "-warning"; + req_access = list("medical") }, /obj/structure/chair{ dir = 8 @@ -63984,7 +64039,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, -/turf/open/floor/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, /area/station/medical/medbay/lobby) "vVu" = ( /obj/structure/table, diff --git a/_maps/map_files/moonstation/moonstation.dmm b/_maps/map_files/moonstation/moonstation.dmm index ab0160a230f..7e24146894e 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -131,6 +131,15 @@ /obj/machinery/air_sensor/engine_chamber, /turf/open/floor/engine, /area/station/engineering/supermatter) +"acm" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "acp" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/structure/table, @@ -194,6 +203,15 @@ /obj/effect/landmark/navigate_destination/hydro, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/fore) +"ada" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/machinery/firealarm/directional/west, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/server) "add" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -259,15 +277,6 @@ /obj/item/clothing/glasses/meson, /turf/open/floor/plating, /area/station/maintenance/department/prison) -"adT" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/vending/cigarette, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark, -/area/station/commons/public_dock) "adU" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 5 @@ -471,11 +480,6 @@ luminosity = 2 }, /area/station/command/vault) -"agp" = ( -/obj/machinery/computer/order_console/mining, -/obj/machinery/camera/autoname/mine/directional/south, -/turf/open/floor/pod, -/area/station/cargo/miningfoundry/event_protected) "ags" = ( /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/open/misc/grass/jungle, @@ -507,18 +511,6 @@ }, /turf/open/floor/plating, /area/station/security/brig) -"agV" = ( -/obj/structure/sign/warning/docking/directional/west, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 5 - }, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/transport/guideway_sensor{ - dir = 1 - }, -/obj/machinery/light/cold/no_nightlight/directional/west, -/turf/open/floor/plating/rust/moonstation, -/area/moonstation/surface) "agW" = ( /obj/machinery/holopad, /obj/effect/landmark/event_spawn, @@ -560,6 +552,18 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron, /area/station/command/eva) +"ahI" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/hallway) "ahL" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -743,6 +747,19 @@ /obj/effect/mapping_helpers/mail_sorting/science/robotics, /turf/open/floor/iron/white, /area/station/science/lobby) +"ajR" = ( +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/secondary/exit/departure_lounge) "ajU" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/structure/table_or_rack, @@ -767,6 +784,14 @@ /obj/effect/landmark/blobstart, /turf/open/floor/iron/showroomfloor, /area/station/common/locker_room_shower) +"akd" = ( +/obj/effect/landmark/start/clown, +/obj/machinery/firealarm/directional/east, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/carpet, +/area/station/commons/lounge) "aki" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -1043,6 +1068,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/service/abandoned_gambling_den) +"aoz" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "aoA" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ dir = 8 @@ -1244,9 +1280,6 @@ /obj/effect/turf_decal/tile/dark/full, /turf/open/floor/iron, /area/station/engineering/atmos) -"arz" = ( -/turf/open/floor/plating, -/area/station/maintenance/department/chapel) "arB" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/structure/platform, @@ -1288,18 +1321,6 @@ "asb" = ( /turf/open/floor/plating, /area/station/security/checkpoint/customs) -"ask" = ( -/obj/machinery/door/airlock/maintenance, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/mapping_helpers/airlock/unres{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/hallway/primary/starboard) "asm" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -1492,6 +1513,17 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/ce) +"atZ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/obj/effect/turf_decal/stripes/white/line, +/turf/open/floor/iron, +/area/station/science/explab) "aue" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -1642,19 +1674,6 @@ /obj/structure/sign/warning/docking/directional/south, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"avS" = ( -/obj/machinery/button/door/directional/north{ - id = "qm_warehouse"; - name = "Warehouse Shutters Control"; - pixel_x = 24; - req_access = list("shipping") - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/catwalk_floor, -/area/station/cargo/sorting) "avT" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 1 @@ -1863,6 +1882,15 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/upper) +"ayr" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/airalarm/directional/north, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/stripes/corner, +/turf/open/floor/engine, +/area/station/engineering/main) "ayt" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -1884,6 +1912,15 @@ /obj/machinery/portable_atmospherics/canister/air, /turf/open/floor/plating, /area/station/maintenance/starboard) +"azd" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution, +/obj/structure/sign/warning/fire/directional/south, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/engine, +/area/station/maintenance/disposal) "azf" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 4 @@ -1902,6 +1939,20 @@ planetary_atmos = 0 }, /area/moonstation/surface) +"azq" = ( +/obj/machinery/door/airlock/engineering{ + name = "Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper{ + dir = 1 + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "azt" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -2428,14 +2479,6 @@ /obj/structure/sign/departments/chemistry/directional/east, /turf/open/openspace, /area/station/medical/pharmacy) -"aFS" = ( -/obj/structure/table, -/obj/effect/spawner/random/bureaucracy/briefcase, -/obj/effect/turf_decal/tile/red/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "aGa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, @@ -2445,6 +2488,14 @@ /obj/structure/chair/plastic, /turf/open/floor/plastic, /area/station/commons/public_xenoarch) +"aGl" = ( +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "aGm" = ( /obj/machinery/door/airlock/public/glass{ name = "Art Storage" @@ -2624,6 +2675,10 @@ }, /turf/open/floor/wood/parquet, /area/station/engineering/break_room) +"aIf" = ( +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "aIg" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -2876,6 +2931,15 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/security/prison/mess) +"aMy" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/central/fore) "aMz" = ( /turf/open/floor/plating, /area/station/commons/public_dock) @@ -2975,15 +3039,6 @@ /obj/item/kirbyplants/random/dead, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"aOh" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, -/obj/effect/mapping_helpers/airlock/autoname, -/turf/open/floor/plating, -/area/station/medical/chemistry) "aOl" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -3144,10 +3199,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron, /area/station/commons/public_mining) -"aPK" = ( -/obj/structure/sign/poster/random/directional/south, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/maintenance/department/engine) "aPT" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 8 @@ -3482,16 +3533,6 @@ luminosity = 2 }, /area/station/command/vault) -"aTP" = ( -/obj/structure/table, -/obj/item/pai_card, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "aTS" = ( /obj/structure/table/wood, /obj/item/flashlight/lamp, @@ -3690,6 +3731,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron, /area/station/security/prison/upper) +"aWj" = ( +/obj/effect/turf_decal/tile/yellow, +/obj/effect/turf_decal/tile/blue{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/firealarm/directional/south, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/starboard) "aWk" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -3905,6 +3957,14 @@ "aZw" = ( /turf/open/floor/glass/reinforced/scrape_below, /area/station/command/gateway) +"aZy" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, +/obj/machinery/firealarm/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "aZz" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -4449,13 +4509,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/department/prison) -"biu" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/obj/machinery/firealarm/directional/west, -/obj/structure/extinguisher_cabinet/directional/north, +"bix" = ( +/obj/structure/table, +/obj/effect/spawner/random/bureaucracy/briefcase, +/obj/effect/turf_decal/tile/red/anticorner/contrasted{ + dir = 1 + }, +/obj/machinery/button/door/directional/north{ + id = "medsecprivacy"; + name = "Privacy Shutters Control"; + req_access = list("security") + }, /turf/open/floor/iron/dark, -/area/station/science/server) +/area/station/security/checkpoint/medical) "biy" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -4937,13 +5003,6 @@ }, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/maintenance/abandon_cafeteria) -"bpa" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/main) "bpq" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/tile/bar/half/contrasted{ @@ -5124,10 +5183,6 @@ /obj/structure/ladder, /turf/open/floor/plastic, /area/station/commons/public_xenoarch) -"bsp" = ( -/obj/effect/spawner/random/trash/grime, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/maintenance/disposal) "bsC" = ( /obj/structure/table, /obj/machinery/dish_drive/bullet{ @@ -5171,6 +5226,11 @@ }, /turf/open/floor/iron/white, /area/station/security/medical) +"bth" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "btr" = ( /obj/structure/stone_tile/surrounding_tile{ dir = 1 @@ -5417,12 +5477,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark/smooth_large, /area/station/common/wrestling/arena) -"bxp" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "bxy" = ( /obj/item/radio/intercom/directional/west, /obj/structure/table, @@ -5522,6 +5576,18 @@ initial_gas_mix = "n2=100;TEMP=80" }, /area/station/tcommsat/server) +"byx" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/yellow/opposingcorners{ + dir = 1 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/machinery/status_display/evac/directional/north, +/obj/machinery/camera/autoname/engineering/directional/west, +/turf/open/floor/iron, +/area/station/engineering/atmos/control_center) "byK" = ( /obj/machinery/vending/tool, /obj/effect/turf_decal/tile/yellow/half/contrasted{ @@ -5627,13 +5693,6 @@ }, /turf/open/floor/carpet/orange, /area/station/command/heads_quarters/ce) -"bAy" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/cargo/sorting) "bAF" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -5797,6 +5856,18 @@ }, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"bCC" = ( +/obj/effect/turf_decal/siding/dark_blue, +/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ + dir = 8 + }, +/obj/machinery/cryopod{ + dir = 8 + }, +/obj/effect/turf_decal/bot, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/checker, +/area/station/commons/dorms) "bCF" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5874,6 +5945,13 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/checker, /area/station/engineering/storage/tech) +"bDA" = ( +/obj/machinery/modular_computer/preset/engineering{ + dir = 8 + }, +/obj/item/radio/intercom/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "bDN" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -5910,18 +5988,6 @@ /obj/item/modular_computer/laptop/gamer, /turf/open/floor/wood, /area/station/maintenance/abandon_arcade) -"bEs" = ( -/obj/structure/table/wood, -/obj/item/flatpack{ - board = /obj/item/circuitboard/machine/flatpacker; - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/multitool{ - pixel_x = 8 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) "bEx" = ( /obj/structure/table/wood, /obj/item/paper_bin, @@ -6093,6 +6159,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"bGQ" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/holopad, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/chemistry) "bGR" = ( /obj/effect/spawner/random/burgerstation/power, /turf/open/floor/plating, @@ -6178,15 +6249,6 @@ "bIg" = ( /turf/open/floor/engine/n2, /area/station/engineering/atmos) -"bIn" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "bIp" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -6217,6 +6279,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/department/prison) +"bJc" = ( +/obj/machinery/light_switch/directional/south, +/obj/effect/spawner/random/trash/soap, +/obj/effect/turf_decal/siding/yellow/end{ + dir = 1 + }, +/obj/machinery/shower/directional/north, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/noslip, +/area/station/medical/pharmacy) "bJe" = ( /obj/structure/stone_tile/block/burnt{ dir = 8 @@ -6281,11 +6353,6 @@ /obj/effect/mapping_helpers/requests_console/assistance, /turf/open/floor/iron/terracotta, /area/station/commons/storage/art) -"bJT" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/starboard) "bJY" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -6331,6 +6398,17 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"bKu" = ( +/obj/structure/reagent_dispensers/watertank, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light/small/directional/north, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/commons/storage/primary) "bKy" = ( /obj/machinery/atmospherics/components/unary/passive_vent{ dir = 4 @@ -6350,6 +6428,28 @@ "bKR" = ( /turf/closed/wall, /area/station/commons/dorms) +"bKZ" = ( +/obj/structure/closet/crate/hydroponics, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/seeds/onion, +/obj/item/seeds/garlic, +/obj/item/seeds/potato, +/obj/item/seeds/tomato, +/obj/item/seeds/carrot, +/obj/item/seeds/grass, +/obj/item/seeds/ambrosia, +/obj/item/seeds/wheat, +/obj/item/seeds/pumpkin, +/obj/structure/window/spawner/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/item/seeds/tower, +/obj/effect/turf_decal/siding/dark, +/obj/item/radio/intercom/prison/directional/west, +/obj/effect/decal/cleanable/dirt, +/obj/effect/spawner/random/contraband/prison, +/obj/machinery/camera/autoname/prison/directional/west, +/turf/open/floor/iron/dark, +/area/station/security/prison/garden) "bLh" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 1 @@ -6540,6 +6640,16 @@ /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/showroomfloor, /area/station/commons/fitness/locker_room) +"bOJ" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/aft) "bOR" = ( /obj/effect/landmark/start/cook, /obj/effect/turf_decal/tile/dark_red/opposingcorners{ @@ -6618,12 +6728,30 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark/herringbone, /area/station/medical/morgue) +"bPW" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "bPX" = ( /obj/structure/chair{ dir = 1 }, /turf/open/floor/carpet/red, /area/station/service/lawoffice) +"bQa" = ( +/obj/machinery/light/directional/east, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/obj/machinery/status_display/evac/directional/east, +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/secondary/exit/departure_lounge) "bQf" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, @@ -6647,21 +6775,6 @@ /obj/machinery/status_display/ai/directional/east, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) -"bQv" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/wood/parquet, -/area/station/hallway/primary/central/fore) -"bQz" = ( -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/light/floor, -/obj/effect/landmark/blobstart, -/obj/effect/landmark/event_spawn, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/chemistry) "bQA" = ( /obj/machinery/light/small/red/directional/east, /turf/open/floor/plating, @@ -6688,11 +6801,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/station/maintenance/night_club) -"bQG" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "bQH" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 8 @@ -7149,15 +7257,6 @@ /obj/effect/spawner/random/burgerstation/blocking, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"bXH" = ( -/obj/machinery/airalarm/directional/west, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/carpet, -/area/station/service/library) "bXI" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden, @@ -7246,6 +7345,22 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/iron, /area/station/cargo/sorting) +"bYI" = ( +/obj/effect/mapping_helpers/airlock/access/all/science/rd, +/obj/structure/plasticflaps/kitchen, +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/machinery/door/airlock/command/glass{ + name = "Server Access" + }, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/plating, +/area/station/science/server) +"bYM" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/south, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "bYP" = ( /obj/effect/turf_decal/tile/blue/anticorner/contrasted{ dir = 8 @@ -7265,6 +7380,12 @@ /obj/item/fakeartefact, /turf/open/floor/plating, /area/station/maintenance/clown_chamber) +"bZD" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "bZO" = ( /obj/machinery/button/curtain{ id = "nightclub_curtains"; @@ -7644,17 +7765,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"cfs" = ( -/obj/structure/reagent_dispensers/watertank, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/light/small/directional/north, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/commons/storage/primary) "cfv" = ( /obj/machinery/mass_driver/trash{ dir = 4 @@ -7845,6 +7955,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) +"cho" = ( +/obj/effect/decal/cleanable/plastic, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "chE" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -7935,6 +8050,16 @@ /obj/machinery/libraryscanner, /turf/open/floor/carpet, /area/station/service/library) +"cih" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/main) "cij" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -8302,6 +8427,13 @@ /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/aft) +"cmp" = ( +/obj/structure/cable/multilayer/multiz, +/obj/machinery/camera/autoname/mine/directional/north, +/turf/open/openspace{ + can_atmos_pass = 0 + }, +/area/station/cargo/miningelevators) "cmE" = ( /obj/effect/turf_decal/tile/yellow{ dir = 4 @@ -8391,14 +8523,6 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron/dark, /area/station/hallway/primary/aft) -"cnT" = ( -/obj/effect/turf_decal/caution/stand_clear/blue{ - dir = 1 - }, -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/machinery/wall_healer/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "coa" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -8437,19 +8561,6 @@ "cou" = ( /turf/closed/wall/rust, /area/station/terminal/interlink) -"cov" = ( -/obj/structure/table, -/obj/item/toy/figure/scientist{ - pixel_x = -10; - pixel_y = 14 - }, -/obj/item/storage/box/stockparts, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/machinery/newscaster/directional/north, -/turf/open/floor/iron/white, -/area/station/science/lab) "coy" = ( /obj/effect/turf_decal/trimline/dark_red/warning{ dir = 1 @@ -8460,12 +8571,6 @@ }, /turf/open/floor/plating/elevatorshaft, /area/station/cargo/miningelevators) -"coB" = ( -/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ - dir = 4 - }, -/turf/open/floor/engine/airless, -/area/station/maintenance/disposal/incinerator) "coK" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible, /obj/effect/turf_decal/stripes/line{ @@ -8585,6 +8690,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/common/night_club/back_stage) +"crc" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "crd" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 4 @@ -8636,6 +8746,18 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/grass, /area/station/science/genetics) +"crW" = ( +/obj/machinery/modular_computer/preset/id{ + dir = 4 + }, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "crX" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -8846,10 +8968,22 @@ }, /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) +"cwe" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/north, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "cwo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron/dark/herringbone, /area/station/science/ordnance) +"cwq" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/engine_smes) "cwD" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -8904,16 +9038,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"cxw" = ( -/obj/effect/turf_decal/tile/green/half/contrasted, -/obj/machinery/firealarm/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, -/area/station/hallway/secondary/service) "cxI" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/science/rd, @@ -8931,6 +9055,15 @@ /obj/structure/sign/poster/contraband/shamblers_juice/directional/east, /turf/open/floor/iron/dark, /area/station/common/night_club) +"cxU" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "cxV" = ( /obj/structure/stone_tile/cracked{ dir = 4 @@ -8947,18 +9080,6 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library/abandoned) -"cyf" = ( -/obj/machinery/door/airlock/security/glass{ - name = "Security Post - Medbay" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/orderly, -/obj/effect/turf_decal/tile/red/half/contrasted{ - dir = 8 - }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/dark, -/area/station/security/checkpoint/medical) "cyj" = ( /obj/structure/marker_beacon/fuchsia, /obj/structure/sign/warning/secure_area/directional/south, @@ -9026,6 +9147,18 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/primary/central/aft) +"czj" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/hallway) "czk" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -9077,6 +9210,17 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"czQ" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/airalarm/directional/north, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron, +/area/station/terminal/lobby) "czX" = ( /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ dir = 4 @@ -9119,21 +9263,6 @@ }, /turf/open/floor/wood/tile, /area/station/service/cafeteria) -"cAT" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/camera/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/chemistry) -"cAV" = ( -/obj/machinery/light/no_nightlight/directional/north, -/obj/machinery/medical_kiosk, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "cAY" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -9473,6 +9602,13 @@ }, /turf/open/floor/iron/white, /area/station/security/prison/shower) +"cFT" = ( +/obj/effect/decal/cleanable/cobweb, +/obj/structure/disposalpipe/junction{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/sorting) "cFX" = ( /obj/machinery/door/airlock/security{ name = "Detective's Office" @@ -9564,6 +9700,13 @@ /obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) +"cHr" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/chemistry) "cHs" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -9723,6 +9866,16 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/service/library/abandoned) +"cJn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "cJD" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -9780,6 +9933,11 @@ /obj/structure/closet/toolcloset, /turf/open/floor/plating, /area/station/maintenance/department/engine) +"cKs" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "cKB" = ( /obj/machinery/light/directional/north, /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ @@ -9952,6 +10110,14 @@ "cMR" = ( /turf/closed/wall, /area/station/maintenance/department/engine/atmos) +"cMT" = ( +/obj/effect/turf_decal/tile/dark_green/half/contrasted{ + dir = 1 + }, +/obj/machinery/vending/wardrobe/viro_wardrobe, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/virology) "cMV" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -10236,11 +10402,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/prison/workout) -"cQM" = ( -/obj/effect/spawner/random/burgerstation/loot, -/obj/machinery/light/small/red/directional/east, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "cQS" = ( /obj/structure/chair/sofa/corp/left{ dir = 8 @@ -10321,10 +10482,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/upper) -"cRv" = ( -/obj/effect/spawner/random/structure/steam_vent, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "cRz" = ( /obj/machinery/door/poddoor{ id = "justiceblast"; @@ -10378,12 +10535,6 @@ "cRZ" = ( /turf/open/indestructible/tram, /area/station/terminal/lobby) -"cSb" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/engineering/break_room) "cSe" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -10745,6 +10896,13 @@ /obj/item/hfr_box/core, /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) +"cWG" = ( +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/south, +/obj/machinery/airalarm/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/engine_smes) "cWK" = ( /obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/iron/dark, @@ -10854,11 +11012,6 @@ /obj/effect/turf_decal/tile/yellow/diagonal_edge, /turf/open/floor/iron/white/diagonal, /area/station/medical/pharmacy) -"cYr" = ( -/obj/machinery/digital_clock/directional/west, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/wood, -/area/station/command/meeting_room) "cYt" = ( /obj/effect/turf_decal/tile/red/anticorner/contrasted{ dir = 4 @@ -11066,6 +11219,17 @@ /obj/machinery/holopad, /turf/open/floor/wood, /area/station/service/chapel/office) +"dbC" = ( +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/effect/mapping_helpers/apc/full_charge, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/camera/autoname/mine/directional/east, +/turf/open/misc/grass/jungle, +/area/station/biodome) "dbD" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/service/lawyer, @@ -11650,6 +11814,13 @@ /obj/effect/landmark/start/assistant, /turf/open/floor/carpet, /area/station/service/chapel) +"diz" = ( +/obj/machinery/button/door/directional/north{ + id = "vaccant_room_shutters"; + name = "Shutters Control" + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room) "diK" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/autoname, @@ -11903,12 +12074,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) -"dlI" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "dlL" = ( /obj/structure/ladder, /obj/effect/turf_decal/stripes/asteroid/box, @@ -12195,16 +12360,6 @@ /obj/machinery/newscaster/directional/north, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"dpZ" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/item/assembly/mousetrap/armed{ - dir = 8 - }, -/obj/item/kirbyplants/random/dead, -/turf/open/floor/plating, -/area/station/maintenance/port) "dqk" = ( /obj/effect/turf_decal/tile/holiday/rainbow{ dir = 4 @@ -12227,6 +12382,12 @@ /obj/effect/spawner/random/entertainment/colorful_grenades, /turf/open/floor/wood/parquet, /area/station/service/theater) +"dqz" = ( +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/camera/autoname/prison/directional/east, +/turf/open/floor/iron/dark/small, +/area/station/security/corrections_officer) "dqJ" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -12308,13 +12469,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/green, /area/station/command/heads_quarters/nt_rep) -"dse" = ( -/obj/structure/cable, -/obj/structure/railing{ - dir = 1 - }, -/turf/open/floor/catwalk_floor/rust, -/area/station/cargo/miningelevators) "dsi" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted, /obj/machinery/light/directional/south, @@ -12506,11 +12660,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/misc/moonstation_sand, /area/moonstation/surface) -"dvc" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/trash/hobo_squat, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "dvg" = ( /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron/dark, @@ -12614,6 +12763,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/command/bridge) +"dwd" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/cyclelink_helper, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/open/floor/iron/dark/side, +/area/station/engineering/main) "dwn" = ( /obj/machinery/pdapainter, /turf/open/floor/carpet/purple, @@ -13100,6 +13260,16 @@ /obj/effect/spawner/random/food_or_drink/seed, /turf/open/floor/grass, /area/station/service/hydroponics/garden) +"dCG" = ( +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/plating, +/area/station/maintenance/port) "dCQ" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13171,12 +13341,6 @@ /obj/machinery/vending/clothing, /turf/open/floor/iron/dark, /area/station/terminal/interlink) -"dDO" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/engine, -/area/station/engineering/main) "dDS" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ dir = 8 @@ -13266,6 +13430,20 @@ dir = 1 }, /area/station/hallway/secondary/exit) +"dEQ" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/checker, +/area/station/hallway/primary/central/aft) "dER" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13374,13 +13552,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/rd) -"dGO" = ( -/obj/machinery/button/door/directional/north{ - id = "vaccant_room_shutters"; - name = "Shutters Control" - }, -/turf/open/floor/plating, -/area/station/commons/vacant_room) "dHd" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -13570,10 +13741,6 @@ /obj/effect/spawner/liquids_spawner/fulltile, /turf/open/misc/beach/sand, /area/station/hallway/secondary/exit/departure_lounge) -"dJW" = ( -/obj/effect/spawner/random/decoration/glowstick, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "dJZ" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 @@ -13582,15 +13749,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/security/medical) -"dKc" = ( -/obj/machinery/airalarm/directional/south, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/self_actualization_device, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "dKl" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -13743,14 +13901,6 @@ }, /turf/open/floor/iron/dark, /area/station/common/night_club) -"dMy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/airalarm/directional/west, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "dMA" = ( /obj/structure/table/wood/fancy/black, /obj/structure/window/reinforced/spawner/directional/north, @@ -14497,14 +14647,6 @@ /obj/machinery/portable_atmospherics/canister/nitrous_oxide, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) -"dXU" = ( -/obj/structure/cable, -/obj/machinery/door/airlock/engineering/glass, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "dXW" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /turf/open/floor/iron/showroomfloor, @@ -14605,6 +14747,16 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/white, /area/station/science/lab) +"dZv" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/machinery/light/directional/north, +/obj/item/storage/box/stockparts, +/turf/open/floor/iron/white, +/area/station/science/lab) "dZL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14709,29 +14861,12 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) -"ebs" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/disposal/bin, -/obj/machinery/newscaster/directional/north, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, -/area/station/commons/storage/tools) "ebz" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /turf/open/floor/catwalk_floor/iron, /area/station/engineering/break_room) -"ebL" = ( -/obj/machinery/holopad, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "ebN" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -14866,6 +15001,13 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/medical/treatment_center) +"edg" = ( +/obj/structure/bookcase/manuals/engineering, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) "edh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -15301,6 +15443,12 @@ /obj/effect/turf_decal/tile/yellow/diagonal_edge, /turf/open/floor/iron/white/diagonal, /area/station/medical/pharmacy) +"eje" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/machinery/light_switch/directional/south, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "eji" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -15672,6 +15820,16 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/storage/tech) +"emB" = ( +/obj/machinery/suit_storage_unit/rd, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "emJ" = ( /obj/effect/turf_decal/tile/purple/half/contrasted, /obj/structure/table, @@ -15912,16 +16070,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/secure_bunker) -"epE" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/computer/rdservercontrol{ - dir = 4 - }, -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/machinery/camera/autoname/science/directional/west, -/turf/open/floor/iron/dark, -/area/station/science/server) "epH" = ( /obj/effect/turf_decal/stripes/line, /obj/effect/turf_decal/stripes/line{ @@ -16247,6 +16395,9 @@ /obj/structure/fans/tiny, /turf/open/floor/plating, /area/station/common/pool/sauna) +"etQ" = ( +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "etW" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/red/directional/west, @@ -16375,6 +16526,13 @@ /obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) +"ewd" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "ewf" = ( /obj/machinery/teleport/station, /obj/item/radio/intercom/directional/east, @@ -16572,6 +16730,16 @@ /obj/effect/mapping_helpers/damaged_window, /turf/open/floor/plating/lavaland_atmos, /area/station/commons/public_mining) +"exZ" = ( +/obj/machinery/transport/guideway_sensor, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 10 + }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/light/cold/no_nightlight/directional/east, +/obj/structure/sign/warning/docking/directional/east, +/turf/open/floor/plating/rust/moonstation, +/area/station/terminal/tramline) "eyJ" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/plating, @@ -16596,6 +16764,13 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/main) +"ezp" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/secondary/exit) "ezI" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible{ dir = 1 @@ -16697,11 +16872,6 @@ /obj/structure/closet/firecloset, /turf/open/floor/plating, /area/station/maintenance/department/medical/chemistry) -"eBb" = ( -/obj/effect/turf_decal/siding/dark, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/cargo/sorting) "eBc" = ( /obj/effect/turf_decal/tile/purple{ dir = 4 @@ -17059,16 +17229,6 @@ /obj/structure/stone_tile/center, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) -"eFI" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/junction{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "eFL" = ( /obj/effect/turf_decal/tile/brown/half/contrasted, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -17296,15 +17456,6 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"eIq" = ( -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port) "eIr" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/purple/fourcorners, @@ -17409,16 +17560,6 @@ /obj/effect/mapping_helpers/airlock/autoname, /turf/open/floor/wood, /area/station/commons/dorms/room6) -"eKq" = ( -/obj/effect/turf_decal/siding/white{ - dir = 4 - }, -/obj/machinery/firealarm/directional/west, -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/neutral/opposingcorners, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/showroomfloor, -/area/station/common/pool) "eKs" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/cable, @@ -17448,15 +17589,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/herringbone, /area/station/science/ordnance) -"eKA" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/machinery/airalarm/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/herringbone, -/area/station/medical/morgue/office) "eKF" = ( /obj/machinery/door/airlock/virology/glass{ name = "Isolation A" @@ -17542,16 +17674,6 @@ "eMz" = ( /turf/closed/wall/rust, /area/station/maintenance/department/engine) -"eMD" = ( -/obj/machinery/light_switch/directional/south, -/obj/effect/spawner/random/trash/soap, -/obj/effect/turf_decal/siding/yellow/end{ - dir = 1 - }, -/obj/machinery/shower/directional/north, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/noslip, -/area/station/medical/pharmacy) "eMH" = ( /obj/machinery/door/poddoor/shutters{ dir = 1; @@ -17648,6 +17770,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/showroomfloor, /area/station/terminal/cryo) +"eNG" = ( +/obj/machinery/light/small/directional/north, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "eNH" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 @@ -17723,17 +17850,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/central) -"eOF" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/firealarm/directional/west, -/obj/structure/reagent_dispensers/watertank, -/obj/machinery/light/directional/west, -/obj/structure/disposalpipe/segment, -/obj/machinery/camera/autoname/engineering/directional/west, -/turf/open/floor/engine, -/area/station/engineering/main) "eOJ" = ( /obj/structure/railing/wooden_fencing/gate{ dir = 8 @@ -17805,6 +17921,15 @@ /obj/item/storage/box/deputy, /turf/open/floor/iron/dark, /area/station/security/lockers) +"ePU" = ( +/obj/machinery/vending/sustenance, +/obj/effect/turf_decal/tile/red/opposingcorners, +/obj/machinery/airalarm/directional/east, +/obj/structure/cable, +/obj/item/radio/intercom/prison/directional/north, +/obj/machinery/camera/autoname/prison/directional/east, +/turf/open/floor/iron/white, +/area/station/security/prison/mess) "ePV" = ( /obj/effect/spawner/random/trash/box, /obj/structure/sign/poster/contraband/random/directional/west, @@ -18324,6 +18449,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"eWn" = ( +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/light/directional/south, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "eWu" = ( /obj/machinery/hydroponics/soil{ pixel_y = 8 @@ -18851,9 +18982,6 @@ /obj/machinery/wall_healer/directional/south, /turf/open/floor/iron/dark, /area/station/command/cc_dock) -"fdv" = ( -/turf/closed/wall/r_wall, -/area/station/engineering/storage) "fdK" = ( /obj/effect/landmark/start/chaplain, /turf/open/floor/carpet, @@ -18952,17 +19080,6 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/project) -"feK" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Cryogenics" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "feM" = ( /obj/machinery/computer/cargo{ dir = 1 @@ -19154,14 +19271,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/misc/beach/sand, /area/station/common/pool) -"fhi" = ( -/obj/machinery/computer/robotics{ - dir = 8 - }, -/obj/machinery/computer/security/telescreen/rd/directional/east, -/obj/structure/extinguisher_cabinet/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "fhn" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -19301,6 +19410,21 @@ "fks" = ( /turf/open/floor/glass/reinforced/scrape_below, /area/station/service/hydroponics/garden) +"fkt" = ( +/obj/structure/table/wood, +/obj/item/flatpack{ + board = /obj/item/circuitboard/machine/flatpacker; + pixel_x = -6; + pixel_y = 5 + }, +/obj/item/multitool{ + pixel_x = 8 + }, +/obj/effect/turf_decal/siding/yellow{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) "fky" = ( /obj/effect/spawner/random/burgerstation/atmos, /obj/effect/turf_decal/tile/yellow{ @@ -19446,10 +19570,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/engineering/break_room) -"fmB" = ( -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "fmC" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 1 @@ -19748,10 +19868,6 @@ /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/plating, /area/station/engineering/supermatter/waste) -"fqv" = ( -/obj/machinery/firealarm/directional/west, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "fqy" = ( /obj/effect/turf_decal/vg_decals/numbers/three, /obj/effect/turf_decal/bot/left, @@ -19895,6 +20011,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard/aft) +"fsa" = ( +/obj/machinery/air_sensor/incinerator_tank{ + pixel_y = -14 + }, +/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ + dir = 4 + }, +/obj/machinery/sparker/directional/north{ + id = "atmos_incinerator_igniter" + }, +/turf/open/floor/engine/airless, +/area/station/maintenance/disposal/incinerator) "fsc" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, @@ -20099,6 +20227,12 @@ "fux" = ( /turf/closed/wall/rust, /area/station/terminal/maintenance/aft) +"fuz" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "fuF" = ( /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_smooth, @@ -20152,12 +20286,11 @@ /obj/effect/spawner/random/trash/moisture_trap, /turf/open/floor/plating, /area/station/maintenance/fore) -"fvn" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) +"fvj" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/decal/cleanable/glass, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "fvv" = ( /obj/structure/window/reinforced/spawner/directional/north, /obj/effect/turf_decal/siding/wood/corner, @@ -20293,6 +20426,15 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/hallway) +"fwA" = ( +/obj/machinery/status_display/ai/directional/south, +/obj/structure/chair/office{ + dir = 4 + }, +/obj/machinery/camera/autoname/science/directional/south, +/obj/effect/turf_decal/tile/purple/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "fwD" = ( /obj/machinery/requests_console/auto_name/directional/north, /obj/effect/mapping_helpers/requests_console/assistance, @@ -20582,16 +20724,6 @@ "fAd" = ( /turf/closed/wall, /area/station/command/heads_quarters/qm) -"fAe" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/structure/railing{ - dir = 1 - }, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/effect/mapping_helpers/apc/full_charge, -/turf/open/floor/catwalk_floor/rust, -/area/station/cargo/miningelevators) "fAl" = ( /obj/machinery/door/airlock/command/glass{ name = "Bridge Access" @@ -20666,6 +20798,14 @@ }, /turf/open/floor/wood/tile, /area/station/hallway/primary/central/aft) +"fAy" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/obj/machinery/airalarm/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/server) "fAK" = ( /obj/machinery/atmospherics/pipe/bridge_pipe/scrubbers/visible, /obj/machinery/atmospherics/components/binary/pump/off/yellow/visible{ @@ -20861,6 +21001,12 @@ /obj/effect/landmark/start/cargo_technician, /turf/open/floor/iron, /area/station/cargo/storage) +"fDi" = ( +/obj/structure/railing, +/obj/effect/spawner/costume/cutewitch, +/obj/structure/rack, +/turf/open/floor/plating, +/area/station/maintenance/port) "fDq" = ( /obj/structure/filingcabinet/security, /turf/open/floor/wood, @@ -21209,6 +21355,9 @@ /obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/engine, /area/station/science/xenobiology) +"fIj" = ( +/turf/open/floor/iron/dark, +/area/station/cargo/sorting) "fIk" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/disposalpipe/segment, @@ -21308,6 +21457,23 @@ }, /turf/open/floor/wood, /area/station/service/chapel) +"fJx" = ( +/obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/clipboard, +/obj/item/radio/intercom/directional/south, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "fJy" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -21777,6 +21943,16 @@ /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, /area/station/maintenance/port) +"fOE" = ( +/obj/structure/railing{ + dir = 8 + }, +/obj/machinery/light/directional/south, +/obj/structure/rack, +/obj/machinery/firealarm/directional/south, +/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "fON" = ( /obj/effect/turf_decal/trimline/white/line{ dir = 1 @@ -21793,6 +21969,13 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/maintenance/rus_gambling) +"fOR" = ( +/obj/effect/turf_decal/bot, +/obj/machinery/portable_atmospherics/canister/air, +/obj/effect/turf_decal/stripes/line, +/obj/machinery/camera/autoname/engineering/directional/west, +/turf/open/floor/iron/dark, +/area/station/engineering/atmos/storage/gas) "fOS" = ( /obj/structure/fence/post{ dir = 4 @@ -21955,6 +22138,13 @@ }, /turf/open/floor/engine, /area/station/science/explab) +"fQH" = ( +/obj/effect/turf_decal/vg_decals/numbers/one, +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/sand/plating/volcanic, +/obj/machinery/camera/autoname/mine/directional/east, +/turf/open/floor/plating/lavaland_atmos, +/area/station/cargo/miningelevators) "fQJ" = ( /obj/structure/sign/poster/random/directional/west, /obj/structure/cable, @@ -22005,9 +22195,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/circuit, /area/station/command/secure_bunker) -"fRt" = ( -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "fRv" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -22314,6 +22501,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron, /area/station/engineering/atmos/pumproom) +"fWH" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "fWT" = ( /obj/machinery/light_switch/directional/south, /turf/open/floor/plating, @@ -22405,13 +22598,6 @@ /obj/item/newspaper, /turf/open/floor/iron/grimy, /area/station/terminal/lobby) -"fXX" = ( -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/delivery, -/turf/open/floor/plating, -/area/station/maintenance/port) "fYe" = ( /obj/machinery/atmospherics/components/unary/outlet_injector/monitored/nitrogen_input{ dir = 1 @@ -22646,6 +22832,15 @@ /obj/structure/sign/warning/biohazard/directional/west, /turf/closed/wall, /area/station/medical/virology) +"gbq" = ( +/obj/structure/disposalpipe/segment, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/machinery/camera/autoname/prison/directional/east, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/security/prison/work) "gbV" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -22883,14 +23078,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"gfA" = ( -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/central/fore) "gfE" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -23085,6 +23272,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/green/visible, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"giP" = ( +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/shower/directional/south, +/obj/machinery/chem_mass_spec, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/white, +/area/station/medical/pharmacy) "giR" = ( /obj/structure/disposaloutlet{ dir = 1 @@ -23116,6 +23313,16 @@ }, /turf/open/floor/iron/dark/corner, /area/station/common/wrestling/arena) +"gjj" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "gjk" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -23241,6 +23448,13 @@ /obj/structure/tank_holder/anesthetic, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) +"glb" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "glr" = ( /obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /obj/machinery/meter, @@ -23381,6 +23595,11 @@ /obj/effect/spawner/random/engineering/tracking_beacon, /turf/open/floor/iron/dark/small, /area/station/ai/satellite/teleporter) +"gnB" = ( +/obj/machinery/airalarm/directional/south, +/obj/machinery/light/directional/south, +/turf/open/floor/plating, +/area/station/commons/vacant_room) "gnD" = ( /obj/structure/railing{ dir = 4 @@ -23563,6 +23782,16 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) +"gpH" = ( +/obj/effect/turf_decal/siding/white{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/tile/neutral/opposingcorners, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/showroomfloor, +/area/station/common/pool) "gpO" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -23698,6 +23927,16 @@ "grz" = ( /turf/closed/wall/r_wall, /area/station/engineering/main) +"grO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/sorting/mail{ + dir = 1 + }, +/obj/effect/mapping_helpers/mail_sorting/supply/disposals, +/turf/open/floor/plating, +/area/station/maintenance/port) "gsc" = ( /obj/machinery/light/small/directional/west, /obj/structure/extinguisher_cabinet/directional/west, @@ -24030,15 +24269,6 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/starboard) -"gxa" = ( -/obj/machinery/firealarm/directional/south, -/obj/effect/turf_decal/tile/yellow{ - dir = 8 - }, -/obj/effect/turf_decal/tile/blue, -/obj/machinery/camera/autoname/engineering/directional/south, -/turf/open/floor/iron, -/area/station/engineering/atmos) "gxb" = ( /obj/structure/stone_tile{ dir = 4 @@ -24368,18 +24598,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/terminal/interlink) -"gCK" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple{ - dir = 4 - }, -/obj/item/xenoarch/tape_measure, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 12 - }, -/obj/machinery/camera/autoname/mine/directional/east, -/turf/open/floor/plastic, -/area/station/commons/public_xenoarch) "gCN" = ( /obj/effect/landmark/start/bartender, /obj/structure/cable, @@ -24397,14 +24615,6 @@ /obj/structure/sign/departments/chemistry/pharmacy/directional/north, /turf/open/floor/iron/white, /area/station/medical/treatment_center) -"gCY" = ( -/obj/structure/chair/wood{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/carpet/red, -/area/station/commons/lounge) "gDc" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, @@ -24423,11 +24633,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) -"gDg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "gDi" = ( /obj/machinery/atmospherics/components/unary/passive_vent/layer2{ dir = 4 @@ -24516,6 +24721,40 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/disposal) +"gEo" = ( +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/cargo/warehouse) +"gEq" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/structure/hedge, +/obj/structure/sign/directions/command/directional/north{ + pixel_x = -32; + pixel_y = 40 + }, +/obj/structure/sign/directions/upload/directional/north{ + pixel_x = -32; + pixel_y = 24 + }, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/sign/directions/dorms/directional/south{ + pixel_y = 32; + pixel_x = -32 + }, +/obj/machinery/status_display/evac/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/wood/tile, +/area/station/hallway/primary/central/aft) "gEE" = ( /obj/structure/closet/secure_closet/personal/wall{ pixel_x = -25 @@ -24601,6 +24840,11 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/command/heads_quarters/qm) +"gFV" = ( +/obj/effect/spawner/random/structure/grille, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "gGb" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -24673,6 +24917,12 @@ "gGE" = ( /turf/closed/mineral/random/labormineral/volcanic, /area/lavaland/surface/outdoors) +"gGG" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/open/floor/plating, +/area/station/cargo/sorting) "gHa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet/purple, @@ -24740,6 +24990,10 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/carpet, /area/station/commons/lounge) +"gHB" = ( +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "gHG" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -24943,6 +25197,10 @@ /obj/machinery/vending/wardrobe/curator_wardrobe, /turf/open/floor/engine/cult, /area/station/service/library/private) +"gKQ" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/chemistry) "gKS" = ( /obj/machinery/portable_atmospherics/canister/air, /obj/machinery/wall_healer/directional/south, @@ -25007,13 +25265,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/secure_bunker) -"gLz" = ( -/obj/machinery/suit_storage_unit/rd, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "gLJ" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/structure/disposalpipe/segment, @@ -25136,14 +25387,6 @@ /obj/machinery/camera/autoname/prison/directional/north, /turf/open/floor/iron/dark, /area/station/security/brig) -"gNU" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "gNZ" = ( /obj/machinery/door/airlock/external/glass{ name = "External Public Airlock" @@ -25214,11 +25457,6 @@ "gOz" = ( /turf/open/floor/engine, /area/station/engineering/main) -"gOA" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "gOE" = ( /obj/machinery/light/floor, /turf/open/floor/iron, @@ -25291,12 +25529,6 @@ initial_gas_mix = "o2=20.2;n2=78.5;co2=4.6;water_vapor=1.1;TEMP=347.65" }, /area/station/science/ordnance/bomb) -"gPz" = ( -/obj/item/assembly/mousetrap/armed{ - dir = 8 - }, -/turf/open/floor/plating, -/area/station/maintenance/fore) "gPA" = ( /obj/structure/training_machine, /obj/item/target/syndicate, @@ -25373,15 +25605,6 @@ /obj/machinery/light/small/directional/west, /turf/open/floor/plating, /area/station/maintenance/disposal) -"gQZ" = ( -/obj/machinery/conveyor_switch/oneway{ - id = "cargodisposals"; - name = "disposals conveyor switch"; - pixel_x = -10 - }, -/obj/effect/turf_decal/siding/dark, -/turf/open/floor/iron/dark, -/area/station/cargo/sorting) "gRe" = ( /obj/structure/chair/sofa/corp{ dir = 1 @@ -25649,16 +25872,6 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"gUK" = ( -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/shower/directional/south, -/obj/machinery/chem_mass_spec, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/white, -/area/station/medical/pharmacy) "gUO" = ( /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, @@ -26379,17 +26592,6 @@ /obj/structure/extinguisher_cabinet/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"hfH" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted, -/obj/item/storage/toolbox/mechanical{ - pixel_y = 13 - }, -/obj/item/storage/toolbox/electrical{ - pixel_y = 5 - }, -/obj/structure/rack, -/turf/open/floor/iron/white, -/area/station/science/lab) "hfI" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, @@ -26479,12 +26681,6 @@ /obj/machinery/holopad, /turf/open/floor/engine, /area/station/engineering/main) -"hhw" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/server) "hhy" = ( /obj/machinery/atmospherics/components/binary/pump/on/supply/visible{ dir = 4 @@ -26562,6 +26758,10 @@ }, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"hiu" = ( +/obj/effect/spawner/random/trash/grime, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/disposal) "hix" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -26890,6 +27090,21 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating, /area/station/maintenance/department/engine/shuttle_construction_bay) +"hmP" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Medbay Access"; + id_tag = "medbay_access" + }, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/caution/stand_clear/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "hmT" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -26934,13 +27149,6 @@ /obj/structure/sign/warning/directional/north, /turf/open/floor/iron/white, /area/station/medical/virology) -"hno" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/main) "hnt" = ( /obj/structure/cable, /obj/machinery/recharge_station, @@ -27021,6 +27229,19 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/white, /area/station/security/prison/shower) +"hof" = ( +/obj/machinery/airalarm/directional/south, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 9; + alpha = 160 + }, +/obj/machinery/self_actualization_device, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "how" = ( /obj/structure/stone_tile/cracked{ dir = 8 @@ -27058,12 +27279,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/engineering/storage_shared) -"hoY" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "hoZ" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -27520,6 +27735,19 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/commons/storage/emergency/port) +"hvy" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) "hvA" = ( /turf/open/floor/iron, /area/station/hallway/primary/port) @@ -27639,6 +27867,17 @@ "hwN" = ( /turf/open/floor/plating, /area/station/maintenance/department/prison) +"hxc" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/firealarm/directional/west, +/obj/structure/reagent_dispensers/watertank, +/obj/machinery/light/directional/west, +/obj/structure/disposalpipe/segment, +/obj/machinery/camera/autoname/engineering/directional/west, +/turf/open/floor/engine, +/area/station/engineering/main) "hxd" = ( /turf/open/floor/glass/reinforced/scrape_below, /area/station/security/office) @@ -27760,16 +27999,13 @@ /obj/effect/turf_decal/tile/blue, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"hzx" = ( -/obj/structure/window/reinforced/spawner/directional/west, -/obj/machinery/disposal/bin, -/obj/machinery/firealarm/directional/south, -/obj/structure/disposalpipe/trunk{ - dir = 4 +"hzD" = ( +/obj/item/assembly/mousetrap/armed{ + dir = 8 }, -/obj/machinery/camera/autoname/engineering/directional/south, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/storage/eva) +/obj/effect/mapping_helpers/broken_floor, +/turf/open/floor/plating, +/area/station/maintenance/fore) "hzF" = ( /obj/effect/turf_decal/tile/brown/opposingcorners, /obj/effect/turf_decal/tile/purple{ @@ -27857,19 +28093,6 @@ }, /turf/open/floor/engine/co2, /area/station/engineering/atmos) -"hAq" = ( -/obj/effect/turf_decal/siding/yellow{ - dir = 9 - }, -/obj/structure/table, -/obj/effect/spawner/random/decoration/ornament, -/obj/machinery/requests_console/auto_name/directional/west, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/information, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark/herringbone, -/area/station/medical/morgue/office) "hAr" = ( /obj/structure/tank_dispenser/oxygen, /obj/effect/turf_decal/tile/neutral/fourcorners, @@ -28032,12 +28255,6 @@ }, /turf/open/floor/iron/white/small, /area/station/common/pool) -"hCm" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/light/directional/north, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/iron/dark, -/area/station/science/server) "hCo" = ( /obj/structure/closet/emcloset/anchored, /turf/open/floor/plating, @@ -28450,20 +28667,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/dorms) -"hGr" = ( -/obj/machinery/computer/crew{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 8 - }, -/obj/effect/mapping_helpers/requests_console/supplies, -/obj/effect/mapping_helpers/requests_console/information, -/obj/effect/mapping_helpers/requests_console/assistance, -/obj/machinery/requests_console/auto_name/directional/south, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "hGv" = ( /obj/structure/chair/office/light{ dir = 8 @@ -28477,6 +28680,13 @@ /obj/effect/turf_decal/tile/purple/diagonal_centre, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"hGw" = ( +/obj/machinery/computer/station_alert{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "hGD" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 5 @@ -28629,15 +28839,6 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/white, /area/station/science/cytology) -"hIh" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 8 - }, -/turf/open/floor/iron, -/area/station/engineering/break_room) "hIr" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -28710,6 +28911,13 @@ }, /turf/open/floor/engine, /area/station/maintenance/department/engine/shuttle_construction_bay) +"hIR" = ( +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/light/floor, +/obj/effect/landmark/blobstart, +/obj/effect/landmark/event_spawn, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/chemistry) "hIV" = ( /obj/effect/turf_decal/delivery, /obj/structure/cable, @@ -28750,17 +28958,6 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron, /area/station/security/prison/upper) -"hJy" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/landmark/start/chief_medical_officer, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "hJD" = ( /obj/item/assembly/mousetrap/armed{ dir = 4 @@ -28887,6 +29084,13 @@ planetary_atmos = 0 }, /area/moonstation/underground) +"hLe" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/maintenance, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "hLf" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -29013,12 +29217,6 @@ /obj/item/storage/box/matches, /turf/open/floor/wood, /area/station/service/chapel) -"hNg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/effect/spawner/random/maintenance, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "hNn" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29144,6 +29342,10 @@ }, /turf/open/floor/wood/tile, /area/station/common/pool/sauna) +"hPt" = ( +/obj/structure/cable, +/turf/open/floor/plating, +/area/station/cargo/miningelevators) "hPx" = ( /obj/machinery/status_display/supply{ pixel_y = -32 @@ -29176,6 +29378,14 @@ /obj/structure/closet/secure_closet/detective, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) +"hQi" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/wall_healer/directional/east, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/break_room) "hQr" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -29271,13 +29481,6 @@ /obj/effect/landmark/latejoin_override, /turf/open/floor/iron/showroomfloor, /area/station/terminal/cryo) -"hRK" = ( -/obj/effect/decal/cleanable/cobweb, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/cargo/sorting) "hRR" = ( /obj/machinery/atmospherics/components/tank/air{ dir = 1 @@ -29287,11 +29490,6 @@ }, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) -"hRS" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/turf/open/floor/iron/dark, -/area/station/science/server) "hSf" = ( /obj/structure/chair/pew/right{ dir = 4 @@ -29516,18 +29714,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/wood, /area/station/service/abandoned_gambling_den) -"hUK" = ( -/obj/machinery/air_sensor/incinerator_tank{ - pixel_y = -14 - }, -/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{ - dir = 4 - }, -/obj/machinery/sparker/directional/north{ - id = "atmos_incinerator_igniter" - }, -/turf/open/floor/engine/airless, -/area/station/maintenance/disposal/incinerator) "hUM" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -29665,16 +29851,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, /turf/open/floor/plating, /area/station/maintenance/department/engine) -"hWo" = ( -/obj/machinery/transport/guideway_sensor, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 10 - }, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/light/cold/no_nightlight/directional/east, -/obj/structure/sign/warning/docking/directional/east, -/turf/open/floor/plating/rust/moonstation, -/area/moonstation/surface) "hWT" = ( /obj/structure/chair/sofa/right/brown, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -29704,14 +29880,6 @@ /obj/structure/ore_box, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"hXy" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/spawner/random/trash/grime, -/obj/item/assembly/mousetrap/armed{ - dir = 4 - }, -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/maintenance/department/engine/lower) "hXJ" = ( /obj/machinery/door/window/right/directional/west{ name = "Ethical Monkey Pen"; @@ -29803,6 +29971,13 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/station/maintenance/port) +"hYA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/command/eva) "hYG" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/effect/turf_decal/stripes/white/line, @@ -30001,6 +30176,12 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/engineering/storage_shared) +"iay" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "iaA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/rust/moonstation, @@ -30378,15 +30559,6 @@ "igN" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/room) -"igY" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/obj/effect/turf_decal/caution, -/obj/structure/sign/warning/fire/directional/south, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/engine, -/area/station/maintenance/disposal) "ihz" = ( /obj/machinery/door/airlock/wood{ name = "Dorm 3"; @@ -30680,10 +30852,6 @@ /obj/structure/grille/broken, /turf/open/floor/plating, /area/station/ai/satellite/chamber) -"ilz" = ( -/obj/structure/sign/barber/directional/west, -/turf/open/floor/wood/parquet, -/area/station/commons/lounge) "ilD" = ( /obj/machinery/telecomms/server/presets/security, /obj/effect/turf_decal/siding/dark{ @@ -30766,6 +30934,10 @@ }, /turf/open/floor/carpet, /area/station/service/chapel) +"imX" = ( +/obj/structure/sign/warning/electric_shock/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/department/engine) "inh" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -30883,6 +31055,16 @@ /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/open/floor/catwalk_floor/iron_dark, /area/station/terminal/maintenance/fore) +"ipv" = ( +/obj/machinery/computer/cargo/request{ + dir = 1 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron, +/area/station/cargo/lobby) "ipz" = ( /obj/effect/mapping_helpers/broken_floor, /obj/machinery/iv_drip, @@ -31505,16 +31687,6 @@ /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/iron/dark, /area/station/security/eva) -"iyh" = ( -/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ - dir = 8 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white, -/area/station/science/genetics) "iym" = ( /obj/effect/spawner/random/burgerstation/atmos, /obj/structure/disposalpipe/segment{ @@ -31567,6 +31739,26 @@ /obj/machinery/light/small/red/dim/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai/satellite/maintenance) +"iyZ" = ( +/obj/structure/table/reinforced, +/obj/effect/spawner/random/medical/injector, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 4 + }, +/obj/item/emergency_bed, +/obj/machinery/light/no_nightlight/directional/east, +/obj/item/hand_labeler, +/obj/machinery/button/door/directional/east{ + icon_state = "button-warning"; + id = "medbay_access"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + pixel_y = -8; + skin = "-warning" + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "izP" = ( /turf/closed/wall, /area/station/command/heads_quarters/ce) @@ -31597,18 +31789,6 @@ }, /turf/open/floor/wood, /area/station/service/library) -"iAr" = ( -/obj/machinery/transport/guideway_sensor{ - dir = 1 - }, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 9 - }, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/light/cold/no_nightlight/directional/east, -/obj/structure/sign/warning/docking/directional/east, -/turf/open/floor/plating/rust/moonstation, -/area/moonstation/surface) "iAs" = ( /obj/structure/cable, /obj/machinery/firealarm/directional/south, @@ -31917,23 +32097,17 @@ /obj/machinery/camera/autoname/science/directional/south, /turf/open/floor/iron/white, /area/station/science/ordnance/storage) +"iEG" = ( +/obj/structure/cable, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/effect/mapping_helpers/apc/full_charge, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/supermatter/room) "iEI" = ( /obj/structure/closet/emcloset, /turf/open/floor/plating, /area/station/maintenance/department/engine/lower) -"iEK" = ( -/obj/machinery/firealarm/directional/north, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos/hallway) "iEL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -31973,15 +32147,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/courtroom) -"iFd" = ( -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/supply/shipping, -/obj/effect/mapping_helpers/airlock/autoname, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/plating, -/area/station/cargo/sorting) "iFm" = ( /obj/effect/turf_decal/siding/white{ dir = 4 @@ -31999,13 +32164,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/brig) -"iFo" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "iFy" = ( /obj/structure/sign/warning/secure_area{ name = "\improper NO SYNDICATE ALLOWED sign"; @@ -32273,6 +32431,15 @@ /obj/machinery/camera/autoname/directional/west, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit) +"iIM" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + id = "medsecprivacy"; + name = "Privacy Shutters"; + dir = 1 + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) "iIU" = ( /obj/item/radio/intercom/directional/north, /obj/structure/extinguisher_cabinet/directional/west, @@ -32400,11 +32567,6 @@ /obj/effect/landmark/atmospheric_sanity/ignore_area, /turf/open/floor/carpet, /area/station/terminal/lobby) -"iKP" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "iKW" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -32477,10 +32639,6 @@ /obj/structure/cable, /turf/open/floor/wood, /area/station/commons/dorms/room2) -"iMH" = ( -/obj/structure/cable/multilayer/connected, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "iMK" = ( /obj/machinery/space_heater, /obj/effect/decal/cleanable/cobweb, @@ -32565,10 +32723,6 @@ /obj/structure/marker_beacon/fuchsia, /turf/open/floor/plating/rust/moonstation, /area/moonstation/underground) -"iNM" = ( -/obj/structure/sign/poster/random/directional/south, -/turf/open/floor/plating, -/area/station/maintenance/starboard/aft) "iNN" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/airalarm/directional/east, @@ -32617,6 +32771,10 @@ }, /turf/open/floor/plating, /area/station/maintenance/space_hut) +"iOK" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "iOQ" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -32655,9 +32813,6 @@ }, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) -"iPm" = ( -/turf/open/floor/catwalk_floor/iron_smooth, -/area/station/maintenance/department/engine/lower) "iPn" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -32970,6 +33125,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/disposal) +"iSP" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Cryogenics" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "iSV" = ( /obj/effect/turf_decal/siding/blue{ dir = 4 @@ -33057,15 +33224,6 @@ /obj/effect/mapping_helpers/airlock/access/all/command/minisat, /turf/open/floor/iron/dark, /area/station/ai/satellite/service) -"iTR" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "iTS" = ( /obj/effect/mapping_helpers/airlock/autoname, /obj/effect/mapping_helpers/airlock/access/all/engineering/atmos, @@ -33341,13 +33499,6 @@ /obj/item/clothing/glasses/blindfold, /turf/open/floor/iron/white, /area/station/security/medical) -"iXx" = ( -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "iXA" = ( /obj/effect/turf_decal/stripes/white/line{ dir = 1 @@ -33408,6 +33559,16 @@ }, /turf/closed/wall, /area/station/maintenance/night_club) +"iXY" = ( +/obj/effect/turf_decal/tile/green/half/contrasted, +/obj/machinery/firealarm/directional/south, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron, +/area/station/hallway/secondary/service) "iYe" = ( /obj/structure/kitchenspike, /obj/effect/turf_decal/weather/snow, @@ -33776,21 +33937,6 @@ "jcE" = ( /turf/open/floor/plating, /area/station/maintenance/department/engine/lower) -"jcG" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "jcM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -34061,6 +34207,18 @@ /obj/machinery/camera/autoname/aicore/directional/south, /turf/open/floor/circuit/telecomms, /area/station/ai/satellite/chamber) +"jgi" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/white/line, +/obj/effect/turf_decal/trimline/yellow/filled/warning, +/turf/open/floor/iron/white, +/area/station/science/genetics) "jgq" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -34136,18 +34294,6 @@ /obj/machinery/wall_healer/directional/north, /turf/open/floor/iron/white, /area/station/security/medical) -"jhC" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Supermatter Engine Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/structure/cable, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, -/turf/open/floor/plating, -/area/station/engineering/supermatter/room) "jhF" = ( /obj/structure/rack, /obj/item/circuitboard/computer/shuttle/docker, @@ -34239,11 +34385,6 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/storage/tech) -"jiA" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/firealarm/directional/south, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/starboard) "jiF" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -34426,6 +34567,10 @@ initial_gas_mix = "o2=20.2;n2=78.5;co2=4.6;water_vapor=1.1;TEMP=347.65" }, /area/station/science/ordnance/bomb) +"jkP" = ( +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "jkX" = ( /obj/effect/turf_decal/sand/plating, /obj/effect/spawner/random/engineering/tracking_beacon, @@ -34650,10 +34795,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/cargo/miningdock) -"jns" = ( -/obj/machinery/light/small/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "jnu" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/cable, @@ -34800,6 +34941,10 @@ dir = 1 }, /area/station/hallway/secondary/exit) +"joI" = ( +/obj/structure/girder, +/turf/open/floor/plating, +/area/station/maintenance/central) "joN" = ( /obj/structure/platform, /obj/effect/spawner/random/engineering/toolbox, @@ -34816,13 +34961,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron/dark, /area/station/maintenance/disposal/incinerator) -"jpe" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/full, -/obj/structure/sign/warning/electric_shock/directional/north, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "jph" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -34879,15 +35017,6 @@ /obj/item/hand_labeler, /turf/open/floor/wood, /area/station/command/heads_quarters/blueshield) -"jpT" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/atmos/hallway) "jpU" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -34918,6 +35047,18 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/engineering/supermatter/room) +"jqs" = ( +/obj/machinery/firealarm/directional/east, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/structure/cable, +/obj/structure/table/wood, +/obj/machinery/coffeemaker/impressa{ + pixel_y = 3; + pixel_x = 3 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/wood, +/area/station/service/bar) "jqv" = ( /obj/effect/turf_decal/tile/purple/diagonal_centre, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -34936,12 +35077,6 @@ "jqG" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/port/aft) -"jqH" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/item/kirbyplants/random, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "jqM" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/green/visible{ @@ -35137,10 +35272,33 @@ }, /turf/open/floor/plating, /area/station/maintenance/central) +"juv" = ( +/obj/machinery/door/airlock/maintenance, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/any/service/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/mapping_helpers/airlock/unres{ + dir = 8 + }, +/turf/open/floor/plating, +/area/station/hallway/primary/starboard) "juA" = ( /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"juE" = ( +/obj/structure/sign/warning/docking/directional/west, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 5 + }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/transport/guideway_sensor{ + dir = 1 + }, +/obj/machinery/light/cold/no_nightlight/directional/west, +/turf/open/floor/plating/rust/moonstation, +/area/station/terminal/tramline) "juK" = ( /obj/effect/turf_decal/siding/dark{ dir = 8 @@ -35258,6 +35416,11 @@ /obj/effect/turf_decal/trimline/yellow/filled/warning, /turf/open/floor/iron/white, /area/station/medical/storage) +"jwn" = ( +/obj/machinery/digital_clock/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/wood, +/area/station/command/meeting_room) "jws" = ( /turf/open/floor/iron/dark, /area/station/command/gateway) @@ -35430,16 +35593,6 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/port) -"jyB" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/spawner/random/maintenance, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "jyJ" = ( /obj/structure/chair/stool/directional/west, /obj/structure/cable, @@ -35619,21 +35772,6 @@ "jCC" = ( /turf/open/water/moonstation, /area/moonstation/underground) -"jCH" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/item/radio/intercom/directional/west, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/primary/starboard) -"jCJ" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/structure/ladder, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "jCP" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -35650,6 +35788,11 @@ }, /turf/open/floor/iron/white, /area/station/science/cytology) +"jDb" = ( +/obj/effect/spawner/random/maintenance, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, +/turf/open/floor/plating, +/area/station/maintenance/department/engine) "jDg" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -35763,18 +35906,6 @@ /obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/plating, /area/station/maintenance/starboard) -"jET" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "jFa" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -35805,13 +35936,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/carpet/donk, /area/station/commons/dorms/room4) -"jFX" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/wall_healer/directional/east, -/turf/open/floor/iron, -/area/station/engineering/break_room) "jGd" = ( /obj/effect/landmark/start/hangover, /obj/machinery/holopad, @@ -35913,16 +36037,6 @@ /obj/effect/spawner/random/burgerstation/power, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) -"jHv" = ( -/obj/machinery/computer/cargo/request{ - dir = 1 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, -/area/station/cargo/lobby) "jHG" = ( /obj/effect/turf_decal/trimline/dark/filled/shrink_cw{ dir = 1 @@ -36058,15 +36172,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/dark/corner, /area/station/engineering/atmos/hallway) -"jJH" = ( -/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ - dir = 4 - }, -/obj/structure/disposalpipe/segment, -/obj/structure/sign/departments/restroom/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/commons/dorms) "jJJ" = ( /obj/machinery/power/terminal, /obj/machinery/airalarm/directional/east, @@ -36204,14 +36309,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/dark, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard/aft) -"jLC" = ( -/obj/effect/mapping_helpers/burnt_floor, -/obj/effect/spawner/random/decoration/glowstick, -/obj/effect/turf_decal/delivery, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "jLG" = ( /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, @@ -36646,6 +36743,18 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) +"jQH" = ( +/obj/machinery/door/airlock/medical/glass{ + name = "Medbay Storage" + }, +/obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/storage) "jQN" = ( /turf/closed/wall/mineral/wood, /area/station/service/library/private) @@ -36952,6 +37061,15 @@ /obj/effect/mapping_helpers/airlock/access/all/science/ordnance, /turf/open/floor/plating, /area/station/science/ordnance/freezerchamber) +"jVe" = ( +/obj/item/radio/intercom/directional/east, +/obj/machinery/digital_clock/directional/north, +/obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/bot, +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central/fore) "jVf" = ( /obj/structure/ladder, /turf/open/floor/plating, @@ -37048,6 +37166,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"jXb" = ( +/obj/effect/decal/cleanable/glass, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "jXe" = ( /obj/effect/turf_decal/tile/purple/anticorner/contrasted{ dir = 4 @@ -37075,16 +37198,6 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) -"jXm" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "jXr" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -37171,6 +37284,14 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/brown/visible/layer1, /turf/open/floor/iron, /area/station/engineering/atmos) +"jYv" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/wood/parquet, +/area/station/hallway/primary/central/fore) "jYw" = ( /turf/open/floor/iron/chapel{ dir = 1 @@ -37191,6 +37312,10 @@ "jYF" = ( /turf/closed/wall, /area/station/maintenance/port/fore) +"jYT" = ( +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "jYU" = ( /obj/machinery/disposal/bin, /obj/structure/disposalpipe/trunk{ @@ -37380,18 +37505,6 @@ /obj/effect/mapping_helpers/airlock/abandoned, /turf/open/floor/plating, /area/station/maintenance/department/engine/lower) -"kbe" = ( -/obj/effect/turf_decal/siding/dark, -/obj/machinery/light_switch/directional/east, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 1 - }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/turf/open/floor/iron/grimy, -/area/station/tcommsat/computer) "kbj" = ( /obj/effect/spawner/random/structure/chair_maintenance{ dir = 8 @@ -37736,6 +37849,12 @@ /obj/machinery/light/small/directional/east, /turf/open/floor/iron/checker, /area/station/maintenance/abandon_surgery) +"kgj" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/sorting) "kgs" = ( /obj/machinery/suit_storage_unit, /obj/effect/turf_decal/delivery, @@ -37809,6 +37928,17 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"kif" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/modular_computer/preset/cargochat/cargo{ + dir = 1 + }, +/obj/machinery/firealarm/directional/south, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron, +/area/station/cargo/office) "kij" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -37885,13 +38015,6 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard) -"kiY" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "kjg" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -37963,18 +38086,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/waste) -"kjL" = ( -/obj/effect/turf_decal/siding/dark_blue, -/obj/effect/turf_decal/tile/dark_blue/opposingcorners{ - dir = 8 - }, -/obj/machinery/cryopod{ - dir = 8 - }, -/obj/effect/turf_decal/bot, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/checker, -/area/station/commons/dorms) "kjN" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -38453,13 +38564,11 @@ /obj/item/gun/energy/ionrifle, /turf/open/floor/iron/dark, /area/station/security/armory) -"kpS" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) +"kpU" = ( +/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, +/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "kqc" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -38472,23 +38581,6 @@ /obj/machinery/vending/coffee, /turf/open/floor/wood, /area/station/hallway/primary/central/fore) -"kqf" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Medbay Access"; - id_tag = "medbay_access" - }, -/obj/effect/mapping_helpers/airlock/access/any/science/genetics, -/obj/effect/mapping_helpers/airlock/access/any/medical/general, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment, -/obj/effect/landmark/navigate_destination/autoname, -/obj/effect/mapping_helpers/airlock/unres, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "kqj" = ( /obj/machinery/door/airlock/maintenance, /obj/effect/mapping_helpers/airlock/unres{ @@ -39069,6 +39161,10 @@ }, /turf/open/misc/moonstation_sand, /area/moonstation/surface) +"kyh" = ( +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/medical/chemistry) "kyi" = ( /obj/effect/turf_decal/bot/left, /obj/effect/turf_decal/vg_decals/numbers/three, @@ -39359,12 +39455,6 @@ planetary_atmos = 0 }, /area/moonstation/underground) -"kBR" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/dark, -/area/station/science/ordnance/testlab) "kBZ" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -39658,11 +39748,6 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/iron, /area/station/engineering/break_room) -"kFe" = ( -/obj/effect/decal/cleanable/glass, -/obj/structure/cable/multilayer/multiz, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "kFm" = ( /obj/effect/spawner/random/burgerstation/power, /turf/open/floor/catwalk_floor/iron_dark, @@ -39850,6 +39935,11 @@ }, /turf/open/floor/iron/checker, /area/station/engineering/atmos/hallway) +"kIV" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/plating, +/area/station/maintenance/department/medical/morgue) "kIX" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/structure/disposalpipe/segment, @@ -39996,6 +40086,16 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"kKN" = ( +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/yellow/fourcorners, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/open/floor/iron, +/area/station/engineering/storage) "kKT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -40033,6 +40133,11 @@ /obj/effect/turf_decal/caution/stand_clear/white, /turf/open/floor/plating/rust/moonstation, /area/station/cargo/miningelevators) +"kLE" = ( +/obj/structure/ladder, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/medical/chemistry) "kLH" = ( /obj/structure/chair{ dir = 1; @@ -40317,6 +40422,16 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/abandon_surgery) +"kPs" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 4 + }, +/obj/machinery/computer/exoscanner_control{ + dir = 1 + }, +/obj/machinery/camera/autoname/engineering/directional/south, +/turf/open/floor/circuit, +/area/station/cargo/drone_bay) "kPE" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, @@ -40673,15 +40788,22 @@ }, /turf/open/floor/iron/checker, /area/station/service/janitor) -"kUw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/main) "kUC" = ( /turf/closed/mineral/lunar, /area/moonstation/surface) +"kUD" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 6 + }, +/obj/structure/chair/office/light{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 1 + }, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "kUG" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/east, /obj/structure/flora/ocean/longseaweed, @@ -40780,6 +40902,13 @@ /obj/item/target/clown, /turf/open/floor/plating, /area/station/security/range) +"kVy" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/machinery/wall_healer/directional/north, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "kVC" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 8 @@ -40909,15 +41038,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/fore) -"kXv" = ( -/obj/effect/turf_decal/stripes/line, -/obj/structure/sign/warning/radiation/directional/south, -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "kXG" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 @@ -41124,28 +41244,6 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library/abandoned) -"lab" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/structure/hedge, -/obj/structure/sign/directions/command/directional/north{ - pixel_x = -32; - pixel_y = 40 - }, -/obj/structure/sign/directions/upload/directional/north{ - pixel_x = -32; - pixel_y = 24 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/sign/directions/dorms/directional/south{ - pixel_y = 32; - pixel_x = -32 - }, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/wood/tile, -/area/station/hallway/primary/central/aft) "lao" = ( /obj/effect/landmark/start/hangover, /obj/effect/landmark/event_spawn, @@ -41274,6 +41372,16 @@ /obj/structure/marker_beacon/teal, /turf/open/water/moonstation/surface, /area/moonstation/surface) +"lbU" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/obj/structure/chair, +/obj/structure/extinguisher_cabinet/directional/north, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron, +/area/station/cargo/lobby) "lbX" = ( /obj/structure/table/wood, /obj/item/paper_bin/carbon, @@ -41743,15 +41851,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"liu" = ( -/obj/effect/turf_decal/stripes/line, -/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "liv" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /obj/effect/decal/cleanable/dirt/dust, @@ -41822,6 +41921,16 @@ }, /turf/open/floor/iron/white, /area/station/science) +"ljj" = ( +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/item/kirbyplants/random/fullysynthetic, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/open/floor/iron/dark/small, +/area/station/ai/upload/chamber) "ljk" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -42208,6 +42317,18 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"lnw" = ( +/obj/machinery/button/door/directional/north{ + id = "qm_warehouse"; + name = "Warehouse Shutters Control"; + pixel_x = 24; + req_access = list("shipping") + }, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/sorting) "lnx" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Supermatter Engine Room" @@ -42363,21 +42484,6 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/primary/aft) -"lpS" = ( -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) -"lpU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/mail_sorting/supply/disposals, -/obj/structure/disposalpipe/sorting/mail{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "lpY" = ( /obj/structure/railing{ dir = 8 @@ -42608,6 +42714,15 @@ /obj/effect/spawner/random/entertainment/plushie_delux, /turf/open/floor/carpet/blue, /area/station/common/pool) +"lsX" = ( +/obj/effect/turf_decal/siding/dark, +/obj/machinery/light_switch/directional/east, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/turf/open/floor/iron/grimy, +/area/station/tcommsat/computer) "ltc" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -43167,16 +43282,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen) -"lAD" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/structure/chair, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, -/area/station/cargo/lobby) "lAK" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -43214,6 +43319,11 @@ /obj/effect/turf_decal/vg_decals/numbers/four, /turf/open/floor/engine, /area/station/science/xenobiology) +"lBc" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/science/server) "lBd" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/plating, @@ -43265,11 +43375,6 @@ /obj/machinery/camera/autoname/engineering/directional/south, /turf/open/floor/iron, /area/station/engineering/break_room) -"lBD" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/effect/decal/cleanable/glass, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "lBM" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/effect/decal/cleanable/dirt, @@ -43349,6 +43454,15 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) +"lCN" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "lCP" = ( /obj/machinery/button/transport/tram/directional/south{ id = 2; @@ -43419,6 +43533,11 @@ /obj/machinery/incident_display/disease, /turf/closed/wall, /area/station/medical/medbay/lobby) +"lDY" = ( +/obj/machinery/camera/autoname/engineering/directional/west, +/obj/machinery/firealarm/directional/west, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/supermatter/room) "lDZ" = ( /obj/structure/transport/linear/public, /obj/structure/railing{ @@ -43447,11 +43566,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/grimy, /area/station/security/detectives_office) -"lEm" = ( -/obj/machinery/digital_clock/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/wood, -/area/station/command/meeting_room) "lEn" = ( /turf/open/floor/iron/large, /area/station/hallway/primary/central/aft) @@ -43612,15 +43726,11 @@ }, /turf/open/floor/wood/parquet, /area/station/security/brig/entrance) -"lGH" = ( -/obj/machinery/modular_computer/preset/id{ - dir = 4 - }, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) +"lGG" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/cable/multilayer/multiz, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "lGN" = ( /obj/effect/turf_decal/tile/dark_blue/opposingcorners{ dir = 8 @@ -43749,13 +43859,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/security/office) -"lIg" = ( -/obj/structure/cable/multilayer/multiz, -/obj/machinery/camera/autoname/mine/directional/north, -/turf/open/openspace{ - can_atmos_pass = 0 - }, -/area/station/cargo/miningelevators) "lIk" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/trash/moisture_trap, @@ -44096,6 +44199,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"lMh" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/starboard) "lMs" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -44182,20 +44295,6 @@ "lNE" = ( /turf/closed/wall, /area/station/commons/dorms/room1) -"lNF" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/hallway) -"lNI" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/effect/spawner/random/trash/grille_or_waste, -/turf/open/floor/plating, -/area/station/maintenance/port) "lNM" = ( /obj/machinery/airalarm/directional/north, /turf/open/floor/iron/recharge_floor, @@ -44255,11 +44354,6 @@ /obj/effect/spawner/liquids_spawner/fulltile, /turf/open/misc/beach/sand, /area/station/hallway/secondary/exit/departure_lounge) -"lOP" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/white, -/area/station/medical/cryo) "lOQ" = ( /obj/structure/chair/office{ dir = 8 @@ -44479,15 +44573,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/evac_maintenance) -"lRX" = ( -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "lRY" = ( /obj/effect/turf_decal/loading_area, /obj/machinery/door/poddoor/shutters/preopen{ @@ -44686,13 +44771,6 @@ /obj/machinery/light/floor, /turf/open/floor/engine, /area/station/security/execution/education) -"lVT" = ( -/obj/effect/turf_decal/vg_decals/numbers/one, -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/sand/plating/volcanic, -/obj/machinery/camera/autoname/mine/directional/east, -/turf/open/floor/plating/lavaland_atmos, -/area/station/cargo/miningelevators) "lWc" = ( /turf/closed/wall/r_wall/rust, /area/station/maintenance/department/engine/shuttle_construction_bay) @@ -44734,6 +44812,16 @@ }, /turf/open/misc/moonstation_sand, /area/moonstation/surface) +"lWG" = ( +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal/bin, +/obj/effect/turf_decal/siding/yellow{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/engineering/break_room) "lWN" = ( /obj/effect/spawner/costume/holiday_priest, /obj/structure/rack, @@ -44959,6 +45047,15 @@ /obj/machinery/computer/security/telescreen/commandbunker/directional/south, /turf/open/floor/circuit, /area/station/command/secure_bunker) +"lYD" = ( +/obj/machinery/airalarm/directional/west, +/obj/machinery/disposal/bin, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/carpet, +/area/station/service/library) "lYK" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -45102,6 +45199,18 @@ /obj/effect/turf_decal/tile/purple/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) +"mac" = ( +/obj/machinery/light/no_nightlight/directional/north, +/obj/machinery/medical_kiosk, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "map" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 8 @@ -45476,16 +45585,6 @@ /obj/structure/sign/warning/firing_range/directional/north, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) -"meI" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/sorting/mail{ - dir = 8 - }, -/obj/effect/mapping_helpers/mail_sorting/science/genetics, -/turf/open/floor/plating, -/area/station/maintenance/aft) "meR" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -45606,6 +45705,15 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/station/maintenance/abandon_arcade) +"mgA" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/supermatter/room) "mgD" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -45712,6 +45820,18 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit) +"mib" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/turf_decal/stripes/white/line{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance/testlab) "mid" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -45767,6 +45887,19 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/dark, /area/station/engineering/storage) +"miT" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 9 + }, +/obj/structure/table, +/obj/effect/spawner/random/decoration/ornament, +/obj/machinery/requests_console/auto_name/directional/west, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/information, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark/herringbone, +/area/station/medical/morgue/office) "miX" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -45878,6 +46011,11 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/command/gateway) +"mkx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/visible, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/cryo) "mkE" = ( /obj/structure/trash_pile, /turf/open/misc/moonstation_rock{ @@ -46250,6 +46388,13 @@ /obj/structure/showcase/machinery/rng, /turf/open/floor/engine, /area/station/ai/satellite/interior) +"mps" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/vg_decals/numbers/three, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/camera/autoname/mine/directional/east, +/turf/open/floor/plating/rust/moonstation, +/area/station/cargo/miningelevators) "mpu" = ( /obj/effect/mapping_helpers/airlock/access/all/command/hop, /obj/machinery/door/airlock/hop{ @@ -46280,6 +46425,17 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/station/terminal/maintenance) +"mqg" = ( +/obj/effect/landmark/start/chief_medical_officer, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/white, +/area/station/command/heads_quarters/cmo) "mqh" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 @@ -46313,6 +46469,14 @@ }, /turf/open/floor/iron/white, /area/station/science) +"mqu" = ( +/obj/effect/turf_decal/stripes/line, +/obj/effect/turf_decal/tile/yellow/anticorner/contrasted, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "mqA" = ( /obj/effect/turf_decal/weather/snow, /obj/machinery/door/airlock/freezer{ @@ -46437,6 +46601,14 @@ /obj/machinery/firealarm/directional/south, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"msI" = ( +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 4 + }, +/obj/machinery/light/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/station/cargo/storage) "msN" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -46534,6 +46706,12 @@ dir = 1 }, /area/station/commons/dorms) +"mtK" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/sorting) "mtV" = ( /obj/structure/cable, /obj/structure/transit_tube/station/reverse/flipped{ @@ -46550,13 +46728,6 @@ }, /turf/open/floor/iron/large, /area/station/hallway/primary/central/fore) -"muq" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "muH" = ( /obj/structure/cable, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -46628,6 +46799,14 @@ /obj/effect/turf_decal/trimline/yellow/warning, /turf/open/floor/engine, /area/station/maintenance/department/engine/shuttle_construction_bay) +"mvF" = ( +/obj/machinery/door/airlock/maintenance_hatch, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/medical/chemistry, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/open/floor/plating, +/area/station/medical/chemistry) "mvI" = ( /obj/effect/turf_decal/tile/dark_blue/half/contrasted{ dir = 1 @@ -46729,6 +46908,21 @@ /obj/item/fakeartefact, /turf/open/floor/plating, /area/station/maintenance/department/public_mining) +"mxs" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Medbay" + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/warning{ + alpha = 160 + }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1; + alpha = 160 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "mxE" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 4 @@ -46851,6 +47045,18 @@ }, /turf/open/floor/iron/cafeteria, /area/station/hallway/primary/central/fore) +"mzv" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/science/ordnance) "mzA" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 8 @@ -46897,12 +47103,6 @@ /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, /area/station/science/robotics/mechbay) -"mAy" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/full, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "mAK" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/carpet/donk, @@ -47024,21 +47224,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/armory) -"mBN" = ( -/obj/structure/showcase/cyborg/old{ - dir = 4; - pixel_x = -9; - pixel_y = 2 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/firealarm/directional/west, -/obj/machinery/light/small/red/directional/west, -/turf/open/floor/circuit/green, -/area/station/ai/upload/chamber) "mBQ" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/spawner/random/decoration/glowstick, @@ -47078,12 +47263,6 @@ /obj/structure/sign/poster/contraband/random/directional/east, /turf/open/floor/plating, /area/station/maintenance/abandon_office) -"mCr" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/iron/white, -/area/station/science) "mCx" = ( /obj/structure/table, /obj/structure/bedsheetbin, @@ -47196,6 +47375,15 @@ /obj/effect/mapping_helpers/airlock/access/all/command/captain, /turf/open/floor/iron/white, /area/station/command/heads_quarters/captain/private) +"mDO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "mEc" = ( /obj/machinery/door/airlock/engineering/glass{ name = "Emitter Room" @@ -47289,6 +47477,14 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/space_hut) +"mFY" = ( +/obj/effect/turf_decal/stripes/line, +/obj/structure/sign/warning/radiation/directional/south, +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/iron/dark, +/area/station/engineering/main) "mGb" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -47529,14 +47725,6 @@ /obj/item/storage/lockbox/loyalty, /turf/open/floor/iron/dark, /area/station/security/armory) -"mIS" = ( -/obj/effect/turf_decal/bot, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/structure/crate_loot, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "mIT" = ( /obj/machinery/porta_turret/ai, /obj/machinery/light/cold/directional/north, @@ -47564,13 +47752,6 @@ /obj/item/radio/intercom/prison/directional/west, /turf/open/floor/iron, /area/station/security/prison/upper) -"mJc" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/effect/spawner/random/burgerstation/loot, -/turf/open/floor/plating, -/area/station/maintenance/starboard/fore) "mJn" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 1 @@ -47682,11 +47863,6 @@ /obj/effect/spawner/random/maintenance, /turf/open/floor/plating, /area/station/maintenance/starboard) -"mLq" = ( -/obj/effect/spawner/random/burgerstation/loot, -/obj/effect/decal/cleanable/cobweb/cobweb2, -/turf/open/floor/plating/foam, -/area/station/maintenance/department/medical/morgue) "mLz" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 @@ -47837,17 +48013,21 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/security/evidence) -"mMX" = ( -/obj/machinery/firealarm/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/plating, -/area/station/commons/vacant_room) "mNe" = ( /obj/effect/turf_decal/stripes/line{ dir = 4 }, /turf/open/floor/plating, /area/station/hallway/primary/tram/left) +"mNv" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron, +/area/station/engineering/atmos/hallway) "mNW" = ( /obj/effect/turf_decal/siding/dark/corner{ dir = 4 @@ -47881,16 +48061,6 @@ /obj/effect/mapping_helpers/mail_sorting/medbay/general, /turf/open/floor/iron/large, /area/station/engineering/atmos/hallway) -"mOJ" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 4 - }, -/obj/machinery/computer/exoscanner_control{ - dir = 1 - }, -/obj/machinery/camera/autoname/engineering/directional/south, -/turf/open/floor/circuit, -/area/station/cargo/drone_bay) "mPh" = ( /obj/structure/cable, /turf/open/floor/plating/rust/moonstation, @@ -48314,17 +48484,6 @@ /obj/structure/sign/departments/security/directional/east, /turf/open/floor/wood/tile, /area/station/security/brig/entrance) -"mUA" = ( -/obj/machinery/modular_computer/preset/research{ - dir = 4 - }, -/obj/machinery/button/door/directional/west{ - id = "rd_office_shutters"; - name = "Privacy Shutters Control"; - req_access = list("rd") - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "mUM" = ( /obj/effect/turf_decal/tile/brown{ dir = 1 @@ -49214,6 +49373,19 @@ /obj/structure/window/paperframe, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"nib" = ( +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/machinery/door/airlock/medical{ + name = "Operating Room" + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery) "nig" = ( /obj/structure/closet/secure_closet/barber, /obj/effect/turf_decal/siding/dark, @@ -49248,15 +49420,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/prison/upper) -"niQ" = ( -/obj/effect/turf_decal/trimline/blue/filled/line{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/white, -/area/station/medical/treatment_center) "niY" = ( /obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ dir = 8 @@ -49446,11 +49609,6 @@ dir = 1 }, /area/station/command/cc_dock) -"nmH" = ( -/obj/structure/cable/layer3, -/obj/machinery/holopad, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "nmT" = ( /obj/structure/rack, /obj/effect/spawner/random/engineering/vending_restock, @@ -49485,6 +49643,16 @@ /obj/structure/ladder, /turf/open/floor/plating/rust/moonstation, /area/station/terminal/maintenance/aft) +"nns" = ( +/obj/machinery/computer/rdservercontrol{ + dir = 4 + }, +/obj/machinery/power/apc/auto_name/directional/south, +/obj/structure/cable, +/obj/machinery/camera/autoname/science/directional/west, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/science/server) "nnt" = ( /obj/effect/turf_decal/siding/yellow{ dir = 6 @@ -49565,6 +49733,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"nof" = ( +/obj/structure/closet/secure_closet/engineering_personal, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/light_switch/directional/north, +/obj/machinery/light/directional/north, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/storage) "nol" = ( /obj/structure/window/reinforced/spawner/directional/west, /obj/structure/table/wood/fancy/blue, @@ -49675,13 +49853,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/station/maintenance/port) -"npq" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron, -/area/station/cargo/sorting) "nps" = ( /obj/effect/turf_decal/siding/purple/corner, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -49822,17 +49993,6 @@ /obj/structure/cable, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/storage) -"nrg" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/modular_computer/preset/cargochat/cargo{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, -/area/station/cargo/office) "nrh" = ( /obj/effect/turf_decal/siding/wood{ dir = 4 @@ -49849,15 +50009,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/commons/vacant_room) -"nro" = ( -/obj/machinery/door/airlock/medical/glass{ - name = "Medbay Storage" - }, -/obj/effect/mapping_helpers/airlock/access/all/medical/general, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/turf/open/floor/iron/white, -/area/station/medical/storage) "nrr" = ( /turf/open/floor/wood/parquet, /area/station/commons/lounge) @@ -49977,6 +50128,11 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine) +"ntm" = ( +/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot, +/obj/effect/decal/cleanable/cobweb, +/turf/open/floor/plating, +/area/station/commons/vacant_room) "ntu" = ( /obj/structure/rack, /obj/item/clothing/suit/hooded/wintercoat, @@ -50305,6 +50461,10 @@ /obj/machinery/incident_display/disease/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"nym" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/turf/open/floor/iron, +/area/station/cargo/sorting) "nyt" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/effect/turf_decal/siding/wood, @@ -50771,30 +50931,6 @@ /obj/item/radio/intercom/prison/directional/south, /turf/open/floor/wood/parquet, /area/station/command/heads_quarters/rd) -"nFk" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/structure/extinguisher_cabinet/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/checker, -/area/station/hallway/primary/central/aft) -"nFp" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 8 - }, -/obj/effect/mapping_helpers/mail_sorting/engineering/general, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/maintenance/department/engine) "nFq" = ( /obj/machinery/atmospherics/pipe/smart/manifold/supply/visible, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -50815,10 +50951,6 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"nFM" = ( -/obj/effect/turf_decal/tile/blue, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "nFN" = ( /turf/closed/wall, /area/station/maintenance/department/medical/chemistry) @@ -51011,6 +51143,12 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/starboard) +"nIC" = ( +/obj/effect/turf_decal/weather/snow, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, +/area/station/medical/coldroom) "nIN" = ( /obj/machinery/atmospherics/pipe/smart/manifold/general/visible, /turf/open/floor/engine, @@ -51173,6 +51311,11 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/crew_quarters/bar) +"nKG" = ( +/obj/structure/sign/poster/random/directional/south, +/obj/item/kirbyplants/random/dead, +/turf/open/floor/plating, +/area/station/maintenance/starboard/aft) "nKN" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /obj/machinery/newscaster/directional/south, @@ -51487,16 +51630,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/medical/chemistry) -"nOo" = ( -/obj/structure/railing{ - dir = 8 - }, -/obj/machinery/light/directional/south, -/obj/structure/rack, -/obj/machinery/firealarm/directional/south, -/obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask, -/turf/open/floor/plating, -/area/station/maintenance/disposal) "nOq" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted{ dir = 8 @@ -51598,14 +51731,18 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/night_club) -"nPH" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 +"nPJ" = ( +/obj/machinery/door/airlock/security{ + name = "Medbay Security Post" }, -/obj/machinery/firealarm/directional/east, -/obj/machinery/camera/autoname/engineering/directional/east, -/turf/open/floor/wood/parquet, -/area/station/engineering/break_room) +/obj/effect/mapping_helpers/airlock/access/all/medical/orderly, +/obj/effect/turf_decal/tile/red/half/contrasted{ + dir = 8 + }, +/obj/machinery/door/firedoor, +/obj/effect/landmark/navigate_destination/autoname, +/turf/open/floor/iron/dark, +/area/station/security/checkpoint/medical) "nPM" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/components/tank/oxygen{ @@ -52040,12 +52177,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port/aft) -"nXj" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/sign/warning/vacuum/external/directional/south, -/obj/machinery/camera/autoname/engineering/directional/south, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "nXm" = ( /obj/machinery/conveyor{ id = "cargodisposals"; @@ -52135,6 +52266,17 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/engineering/supermatter/waste) +"nYE" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/effect/turf_decal/trimline/white/arrow_ccw{ + dir = 8 + }, +/obj/machinery/requests_console/auto_name/directional/west, +/obj/effect/mapping_helpers/requests_console/assistance, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "nYM" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -52160,18 +52302,6 @@ "nYS" = ( /turf/closed/wall/rust, /area/station/maintenance/gag_room) -"nYT" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Medbay Access"; - id_tag = "medbay_access" - }, -/obj/effect/mapping_helpers/airlock/unres, -/obj/effect/mapping_helpers/airlock/access/any/science/genetics, -/obj/effect/mapping_helpers/airlock/access/any/medical/general, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "nYY" = ( /obj/machinery/duct, /obj/effect/turf_decal/tile/purple/half/contrasted, @@ -52190,16 +52320,6 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood, /area/station/service/chapel/office) -"nZf" = ( -/obj/effect/turf_decal/tile/yellow, -/obj/effect/turf_decal/tile/blue{ - dir = 8 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/starboard) "nZr" = ( /obj/machinery/light/floor, /turf/open/floor/iron/checker, @@ -52315,13 +52435,6 @@ /obj/machinery/vending/cigarette, /turf/open/floor/wood, /area/station/commons/lounge) -"oaU" = ( -/obj/effect/turf_decal/siding/dark/end{ - dir = 8 - }, -/obj/machinery/telecomms/message_server/preset, -/turf/open/floor/circuit/telecomms/mainframe, -/area/station/tcommsat/server) "oaW" = ( /obj/machinery/light/floor, /obj/structure/disposalpipe/segment, @@ -52371,15 +52484,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/herringbone, /area/station/medical/morgue/office) -"obv" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/catwalk_floor/iron, -/area/station/engineering/atmos/hallway) "obx" = ( /obj/structure/chair/office{ dir = 8 @@ -52516,6 +52620,16 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/catwalk_floor, /area/station/maintenance/department/crew_quarters/bar) +"ocO" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/medbay/lobby) "ocR" = ( /obj/machinery/computer/crew{ dir = 4 @@ -52624,16 +52738,6 @@ /obj/effect/landmark/latejoin_override, /turf/open/floor/iron/showroomfloor, /area/station/terminal/cryo) -"odV" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron, -/area/station/science/explab) "odX" = ( /obj/machinery/camera/autoname/directional/north, /turf/open/floor/iron/dark, @@ -52680,10 +52784,6 @@ /obj/structure/extinguisher_cabinet/directional/west, /turf/open/floor/carpet/blue, /area/station/commons/dorms/room1) -"oeJ" = ( -/obj/effect/spawner/structure/window/reinforced, -/turf/open/floor/plating, -/area/station/security/checkpoint/medical) "oeL" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -52826,14 +52926,6 @@ /obj/structure/sign/warning/electric_shock/directional/south, /turf/open/floor/iron/dark, /area/station/security/brig) -"ofS" = ( -/obj/structure/chair, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/item/healthanalyzer/simple, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "ofU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -53262,6 +53354,18 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"oln" = ( +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 13 + }, +/obj/item/storage/toolbox/electrical{ + pixel_y = 5 + }, +/obj/structure/rack, +/obj/effect/spawner/random/engineering/toolbox, +/turf/open/floor/iron/white, +/area/station/science/lab) "olq" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/structure/cable, @@ -53697,6 +53801,15 @@ dir = 1 }, /area/station/hallway/primary/port) +"oqr" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/treatment_center) "oqs" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/machinery/airalarm/directional/south, @@ -53931,6 +54044,18 @@ /obj/effect/mapping_helpers/airlock/access/all/engineering/general, /turf/open/floor/plating, /area/station/engineering/supermatter/room) +"otB" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/turf/open/floor/iron/white, +/area/station/science) "otE" = ( /obj/machinery/light/floor, /obj/effect/turf_decal/tile/yellow{ @@ -54020,6 +54145,17 @@ /obj/effect/landmark/navigate_destination/autoname, /turf/open/floor/iron/dark, /area/station/commons/lounge) +"ouV" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 1 + }, +/area/station/medical/medbay/lobby) "ovi" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper, /obj/structure/cable, @@ -54150,13 +54286,6 @@ "owP" = ( /turf/closed/wall/r_wall/rust, /area/station/engineering/atmos/storage/gas) -"oxc" = ( -/obj/item/assembly/mousetrap/armed{ - dir = 4 - }, -/obj/effect/mapping_helpers/broken_floor, -/turf/open/floor/plating, -/area/station/maintenance/department/chapel) "oxh" = ( /obj/structure/cable, /obj/effect/turf_decal/stripes/white/line{ @@ -54256,24 +54385,16 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/cargo/miningdock) -"oyJ" = ( -/obj/effect/turf_decal/stripes/white/line{ - dir = 1 +"oyI" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 1 +/obj/effect/turf_decal/stripes/corner{ + dir = 4 }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/effect/turf_decal/tile/brown, -/obj/machinery/firealarm/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/station/cargo/sorting) +/obj/item/kirbyplants/random, +/turf/open/floor/engine, +/area/station/engineering/main) "oyS" = ( /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, @@ -54308,15 +54429,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine) -"ozm" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/junction{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "ozp" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 8 @@ -54372,16 +54484,6 @@ "oAR" = ( /turf/open/floor/iron, /area/station/engineering/atmos) -"oAW" = ( -/obj/structure/railing/corner/end/flip{ - dir = 8 - }, -/obj/effect/spawner/random/trash/graffiti, -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "oBf" = ( /obj/machinery/door/airlock/maintenance, /obj/structure/cable, @@ -54423,11 +54525,12 @@ /obj/structure/table/reinforced, /turf/open/floor/iron/dark, /area/station/security/office) -"oCn" = ( -/obj/effect/spawner/random/burgerstation/loot/with_maintenance_loot, -/obj/effect/decal/cleanable/cobweb, -/turf/open/floor/plating, -/area/station/commons/vacant_room) +"oCp" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/vg_decals/numbers/two, +/obj/machinery/camera/autoname/mine/directional/east, +/turf/open/floor/plating/rust/moonstation, +/area/station/commons/public_mining) "oCy" = ( /obj/effect/turf_decal/stripes/asteroid/line, /obj/effect/turf_decal/sand/plating/volcanic, @@ -54458,6 +54561,24 @@ }, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"oCX" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Medbay" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/half, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge, +/area/station/medical/medbay/lobby) "oDd" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -54633,6 +54754,11 @@ /obj/machinery/light/floor, /turf/open/floor/iron/checker, /area/station/commons/dorms) +"oEM" = ( +/obj/machinery/computer/order_console/mining, +/obj/machinery/camera/autoname/mine/directional/south, +/turf/open/floor/pod, +/area/station/cargo/miningfoundry/event_protected) "oEO" = ( /obj/structure/table, /obj/effect/spawner/random/food_or_drink/donkpockets, @@ -55002,6 +55128,20 @@ /obj/structure/closet/firecloset, /turf/open/floor/glass/reinforced/scrape_below, /area/station/hallway/secondary/recreation) +"oJt" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 8 + }, +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/disposalpipe/segment{ + dir = 6 + }, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron, +/area/station/terminal/lobby) "oJw" = ( /obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ dir = 4 @@ -55087,14 +55227,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/large, /area/station/engineering/atmos/hallway) -"oKG" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 1 - }, -/obj/machinery/firealarm/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "oKI" = ( /obj/structure/table/glass/plasmaglass, /obj/machinery/chem_dispenser/drinks/beer{ @@ -55319,6 +55451,12 @@ /obj/machinery/camera/autoname/engineering/directional/north, /turf/open/floor/plating, /area/station/maintenance/port) +"oOb" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/main) "oOn" = ( /obj/effect/turf_decal/trimline/dark/filled/warning{ dir = 1 @@ -55462,16 +55600,11 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"oQV" = ( -/obj/structure/closet/secure_closet/engineering_personal, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/obj/machinery/light_switch/directional/north, -/obj/machinery/light/directional/north, -/obj/machinery/camera/autoname/engineering/directional/north, -/turf/open/floor/iron/dark, -/area/station/engineering/storage) +"oQX" = ( +/obj/effect/spawner/random/structure/steam_vent, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "oQZ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55734,12 +55867,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/catwalk_floor/iron_dark, /area/station/security/range) -"oUF" = ( -/obj/structure/cable, -/obj/structure/cable/layer3, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "oUI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -55841,6 +55968,19 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/security/lockers) +"oVW" = ( +/obj/structure/table, +/obj/item/pai_card, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/structure/cable, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "oVY" = ( /obj/effect/turf_decal/tile/dark_red/half/contrasted, /obj/machinery/recharge_station, @@ -56077,17 +56217,6 @@ dir = 1 }, /area/station/hallway/primary/tram/left) -"oYW" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 1 - }, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/airalarm/directional/north, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron, -/area/station/terminal/lobby) "oZa" = ( /obj/structure/cable, /obj/effect/spawner/structure/window/hollow/middle, @@ -56209,14 +56338,6 @@ dir = 1 }, /area/station/hallway/primary/starboard) -"pax" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/main) "paA" = ( /obj/effect/decal/cleanable/greenglow/filled, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -56248,6 +56369,13 @@ /obj/item/fishing_rod, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) +"pbf" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, +/obj/machinery/door/airlock/maintenance_hatch, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/mapping_helpers/airlock/autoname, +/turf/open/floor/plating, +/area/station/engineering/main) "pbi" = ( /obj/machinery/atmospherics/pipe/smart/simple/pink/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, @@ -56792,11 +56920,13 @@ "phc" = ( /turf/open/floor/engine/airless, /area/station/maintenance/disposal/incinerator) -"phh" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +"phg" = ( +/obj/item/assembly/mousetrap/armed{ + dir = 8 + }, +/obj/item/kirbyplants/random/dead, /turf/open/floor/plating, -/area/station/maintenance/port/aft) +/area/station/maintenance/port) "phi" = ( /obj/effect/spawner/random/trash/moisture_trap, /obj/structure/railing{ @@ -56860,13 +56990,6 @@ }, /turf/open/floor/iron, /area/station/hallway/primary/starboard) -"phU" = ( -/obj/effect/turf_decal/bot, -/obj/machinery/portable_atmospherics/canister/air, -/obj/effect/turf_decal/stripes/line, -/obj/machinery/camera/autoname/engineering/directional/west, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/storage/gas) "phW" = ( /obj/effect/landmark/start/cyborg, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -57002,6 +57125,10 @@ }, /turf/open/floor/iron/white, /area/station/science/xenobiology) +"pjw" = ( +/obj/effect/spawner/random/burgerstation/loot, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "pjB" = ( /obj/structure/window/reinforced/spawner/directional/east, /obj/structure/hedge, @@ -57195,6 +57322,13 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/wood, /area/station/commons/vacant_room/commissary) +"plj" = ( +/obj/structure/railing/corner/end/flip{ + dir = 8 + }, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, +/area/station/maintenance/port) "plu" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/tile/purple/half/contrasted{ @@ -57279,12 +57413,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/grass, /area/station/security/prison/garden) -"pmn" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/layer_manifold/purple/visible, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "pms" = ( /obj/effect/turf_decal/tile/yellow/anticorner/contrasted{ dir = 4 @@ -57511,11 +57639,6 @@ /obj/machinery/firealarm/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai/satellite/maintenance) -"ppr" = ( -/obj/machinery/status_display/evac/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "ppH" = ( /obj/structure/table/wood, /obj/machinery/computer/security/telescreen/entertainment/directional/east, @@ -57852,16 +57975,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/science/xenobiology) -"puH" = ( -/obj/machinery/door/poddoor/shutters{ - id = "qm_warehouse"; - name = "Warehouse Shutters" - }, -/obj/effect/turf_decal/tile/brown/fourcorners, -/obj/structure/disposalpipe/segment, -/obj/machinery/door/firedoor, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "puP" = ( /obj/effect/turf_decal/plaque{ icon_state = "L10" @@ -58012,13 +58125,6 @@ /obj/machinery/fat_sucker, /turf/open/floor/plating, /area/station/maintenance/port/fore) -"pwG" = ( -/obj/structure/rack/shelf, -/obj/effect/spawner/random/techstorage/tcomms_all, -/obj/effect/decal/cleanable/dirt/dust, -/obj/machinery/camera/autoname/engineering/directional/north, -/turf/open/floor/plating, -/area/station/engineering/storage/tcomms) "pwH" = ( /obj/effect/spawner/random/trash/bacteria, /turf/open/floor/plating, @@ -58135,6 +58241,11 @@ "pyo" = ( /turf/closed/wall/rust, /area/station/terminal/cryo) +"pyE" = ( +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/port) "pyP" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -58231,19 +58342,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) -"pAr" = ( -/obj/effect/turf_decal/trimline/blue/filled/line, -/obj/effect/turf_decal/caution/stand_clear/blue{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/junction/flip{ - dir = 1 - }, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "pAA" = ( /obj/effect/spawner/random/burgerstation/liquid, /turf/open/floor/plating, @@ -58453,6 +58551,14 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron, /area/station/security/prison/upper) +"pEg" = ( +/obj/item/assembly/mousetrap/armed{ + dir = 4 + }, +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) "pEi" = ( /obj/structure/table, /obj/effect/turf_decal/tile/red/anticorner/contrasted{ @@ -58574,16 +58680,6 @@ /obj/structure/sign/departments/chemistry/pharmacy/directional/east, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"pFh" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/airalarm/directional/south, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "pFj" = ( /obj/effect/spawner/random/engineering/tracking_beacon, /obj/machinery/holopad/secure, @@ -58731,6 +58827,10 @@ /obj/effect/turf_decal/bot/right, /turf/open/floor/engine, /area/station/engineering/atmos/hfr_room) +"pHV" = ( +/obj/effect/spawner/random/trash/graffiti, +/turf/open/floor/plating, +/area/station/maintenance/department/chapel) "pHW" = ( /obj/effect/spawner/random/burgerstation/blocking, /turf/open/floor/plating, @@ -58849,18 +58949,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) -"pJB" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/tile/yellow/opposingcorners{ - dir = 1 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/machinery/status_display/evac/directional/north, -/obj/machinery/camera/autoname/engineering/directional/west, -/turf/open/floor/iron, -/area/station/engineering/atmos/control_center) "pJW" = ( /obj/structure/plasticflaps/opaque, /obj/machinery/navbeacon{ @@ -59038,14 +59126,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"pMA" = ( -/obj/machinery/status_display/ai/directional/south, -/obj/structure/chair/office{ - dir = 4 - }, -/obj/machinery/camera/autoname/science/directional/south, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "pMG" = ( /obj/effect/turf_decal/siding/dark, /turf/open/floor/iron/dark, @@ -59097,6 +59177,14 @@ "pMY" = ( /turf/closed/wall/rust, /area/station/hallway/primary/aft) +"pNg" = ( +/obj/machinery/light/directional/north, +/obj/item/radio/intercom/directional/north, +/obj/effect/turf_decal/tile/neutral/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark, +/area/station/science/server) "pNj" = ( /obj/effect/turf_decal/trimline/yellow/warning{ dir = 8 @@ -59195,6 +59283,12 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/station/service/chapel) +"pPb" = ( +/obj/structure/cable/multilayer/multiz, +/obj/effect/turf_decal/stripes/end, +/obj/machinery/camera/autoname/mine/directional/north, +/turf/open/floor/plating, +/area/station/cargo/miningelevators) "pPd" = ( /obj/machinery/light/floor, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -59250,16 +59344,6 @@ /obj/structure/cable, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) -"pPT" = ( -/obj/machinery/computer/mecha{ - dir = 8 - }, -/obj/machinery/newscaster/directional/east, -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "pPZ" = ( /obj/effect/turf_decal/siding/purple, /obj/effect/turf_decal/tile/purple{ @@ -59459,6 +59543,15 @@ /obj/machinery/camera/autoname/engineering/directional/east, /turf/open/floor/catwalk_floor/iron_dark, /area/station/engineering/supermatter) +"pSO" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/requests_console/information, +/obj/effect/mapping_helpers/requests_console/supplies, +/obj/effect/mapping_helpers/requests_console/assistance, +/obj/machinery/requests_console/auto_name/directional/south, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "pST" = ( /obj/effect/spawner/random/burgerstation/atmos, /turf/open/floor/plating, @@ -59469,14 +59562,6 @@ /obj/effect/spawner/random/entertainment/drugs, /turf/open/floor/iron/dark, /area/station/common/night_club) -"pTi" = ( -/obj/machinery/power/smes/engineering, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/full, -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/autoname/engineering/directional/north, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "pTm" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -59579,10 +59664,6 @@ /obj/effect/turf_decal/tile/red/diagonal_centre, /turf/open/floor/iron/dark, /area/station/security/prison) -"pUL" = ( -/obj/machinery/restaurant_portal/bar, -/turf/open/floor/wood, -/area/station/commons/lounge) "pUT" = ( /obj/effect/turf_decal/siding/wood, /obj/effect/mapping_helpers/broken_floor, @@ -59937,14 +60018,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) -"pYj" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/airalarm/directional/north, -/obj/item/kirbyplants/random, -/turf/open/floor/engine, -/area/station/engineering/main) "pYl" = ( /turf/open/openspace, /area/station/medical/pharmacy) @@ -60056,11 +60129,6 @@ "pZH" = ( /turf/closed/wall/r_wall, /area/station/engineering/supermatter/waste) -"pZJ" = ( -/obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/effect/spawner/random/trash/hobo_squat, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "pZQ" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -60132,6 +60200,14 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, /area/station/maintenance/department/public_mining) +"qaT" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/engineering/directional/east, +/turf/open/floor/wood/parquet, +/area/station/engineering/break_room) "qaW" = ( /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -60347,6 +60423,17 @@ /obj/machinery/duct, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/crew_quarters/bar) +"qdg" = ( +/obj/machinery/hydroponics/constructable, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/obj/effect/spawner/random/food_or_drink/seed, +/obj/machinery/light/directional/north, +/obj/machinery/firealarm/directional/north, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/grass, +/area/station/service/hydroponics/garden) "qdj" = ( /obj/machinery/button/door/directional/north{ id = "visitation"; @@ -60711,10 +60798,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/commons/dorms) -"qhx" = ( -/obj/effect/decal/cleanable/plastic, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "qhN" = ( /obj/structure/cable, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -60743,12 +60826,6 @@ }, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"qhZ" = ( -/obj/effect/turf_decal/weather/snow, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/kitchen_coldroom/freezerfloor, -/area/station/medical/coldroom) "qid" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -60821,15 +60898,6 @@ /obj/effect/spawner/random/burgerstation/table, /turf/open/floor/plating, /area/station/maintenance/starboard) -"qiX" = ( -/obj/structure/disposalpipe/segment{ - dir = 10 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port) "qiY" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/effect/turf_decal/stripes/white/line, @@ -60996,6 +61064,14 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/cargo/miningdock) +"qli" = ( +/obj/effect/turf_decal/bot, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/structure/crate_loot, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "qlm" = ( /obj/effect/turf_decal/tile/red/half/contrasted{ dir = 1 @@ -61006,6 +61082,22 @@ /obj/effect/spawner/random/food_or_drink/cake_ingredients, /turf/open/floor/iron, /area/station/maintenance/abandon_cafeteria) +"qln" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 1 + }, +/area/station/medical/medbay/lobby) "qlo" = ( /obj/effect/turf_decal/tile/dark_green/half/contrasted, /obj/effect/turf_decal/siding/dark, @@ -61171,6 +61263,10 @@ }, /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) +"qnH" = ( +/obj/structure/sign/barber/directional/west, +/turf/open/floor/wood/parquet, +/area/station/commons/lounge) "qnS" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -61266,13 +61362,6 @@ /obj/structure/fireaxecabinet/directional/south, /turf/open/floor/iron/dark, /area/station/engineering/atmos/control_center) -"qpx" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/vg_decals/numbers/three, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/camera/autoname/mine/directional/east, -/turf/open/floor/plating/rust/moonstation, -/area/station/cargo/miningelevators) "qpW" = ( /turf/open/floor/iron/showroomfloor, /area/station/terminal/cryo) @@ -61558,6 +61647,14 @@ "quP" = ( /turf/closed/wall, /area/station/service/chapel/storage) +"quR" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash/grime, +/obj/item/assembly/mousetrap/armed{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/department/engine/lower) "qvc" = ( /obj/structure/railing{ dir = 5 @@ -62009,6 +62106,24 @@ /obj/item/flashlight/flare/candle/infinite, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) +"qAq" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/tile/brown, +/obj/machinery/firealarm/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron, +/area/station/cargo/sorting) "qAB" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 1 @@ -62102,10 +62217,6 @@ planetary_atmos = 0 }, /area/moonstation/underground) -"qBf" = ( -/obj/item/kirbyplants/random, -/turf/open/floor/iron/cafeteria, -/area/station/maintenance/port/aft) "qBg" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 @@ -62336,12 +62447,6 @@ /obj/effect/mapping_helpers/airlock/access/any/service/general, /turf/open/floor/wood, /area/station/service/barber) -"qEv" = ( -/obj/effect/spawner/random/maintenance, -/obj/structure/sign/poster/random/directional/north, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, -/turf/open/floor/plating, -/area/station/maintenance/department/engine) "qEB" = ( /obj/item/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -62425,16 +62530,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) -"qFS" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 1 - }, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "qFU" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -62463,6 +62558,20 @@ /obj/structure/railing, /turf/open/floor/plating/rust/moonstation, /area/moonstation/underground) +"qGi" = ( +/obj/machinery/modular_computer/preset/research{ + dir = 4 + }, +/obj/machinery/button/door/directional/west{ + id = "rd_office_shutters"; + name = "Privacy Shutters Control"; + req_access = list("rd") + }, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted{ + dir = 8 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "qGo" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/command/hop, @@ -62475,11 +62584,6 @@ }, /turf/open/floor/plating, /area/station/command/heads_quarters/hop) -"qGx" = ( -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "qGI" = ( /obj/effect/turf_decal/siding{ dir = 8 @@ -63483,6 +63587,22 @@ }, /turf/open/floor/engine, /area/station/maintenance/department/engine/shuttle_construction_bay) +"qVt" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/warehouse) "qVJ" = ( /obj/effect/spawner/random/burgerstation/loot, /obj/structure/cable, @@ -63961,24 +64081,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) -"rdi" = ( -/obj/structure/table/reinforced, -/obj/machinery/button/door/directional/east{ - id = "medbay_access"; - name = "Medbay Access Door Control"; - normaldoorcontrol = 1; - pixel_y = -8; - req_access = list("medical") - }, -/obj/effect/spawner/random/medical/injector, -/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ - dir = 4 - }, -/obj/item/emergency_bed, -/obj/machinery/light/no_nightlight/directional/east, -/obj/item/hand_labeler, -/turf/open/floor/iron/white, -/area/station/medical/medbay/lobby) "rdk" = ( /obj/structure/sign/departments/cargo/directional/west, /obj/effect/turf_decal/tile/brown/half/contrasted{ @@ -64237,6 +64339,25 @@ }, /turf/open/floor/plating, /area/station/terminal/lobby) +"rgw" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Medbay" + }, +/obj/machinery/door/firedoor, +/obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/tile/blue/half, +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/punch{ + alpha = 160 + }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge, +/area/station/medical/medbay/lobby) "rgD" = ( /obj/machinery/camera/autoname/directional/west, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -64632,16 +64753,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/wood, /area/station/security/courtroom) -"rkW" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 1 - }, -/turf/open/floor/iron/dark, -/area/station/engineering/engine_smes) "rlf" = ( /obj/machinery/door/airlock/public/glass{ name = "Prison Work Room" @@ -64833,15 +64944,6 @@ }, /turf/open/floor/iron/dark, /area/station/science/genetics) -"rnD" = ( -/obj/effect/landmark/start/station_engineer, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable/layer3, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/engine_smes) "rnF" = ( /obj/structure/window/spawner/directional/east{ name = "BREAK GLASS IN CASE OF EMERGENCY" @@ -64927,6 +65029,13 @@ /obj/machinery/power/apc/auto_name/directional/east, /turf/open/floor/plating, /area/station/maintenance/department/engine/atmos) +"roH" = ( +/obj/effect/turf_decal/siding/dark/end{ + dir = 8 + }, +/obj/machinery/telecomms/message_server/preset, +/turf/open/floor/circuit/telecomms/mainframe, +/area/station/tcommsat/server) "roJ" = ( /obj/machinery/light_switch/directional/east, /obj/structure/dresser, @@ -64964,6 +65073,24 @@ /obj/machinery/light/floor, /turf/open/floor/iron/dark/corner, /area/station/common/wrestling/arena) +"rpc" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 4 + }, +/obj/effect/turf_decal/trimline/white/arrow_ccw{ + dir = 4 + }, +/obj/machinery/button/door/directional/east{ + icon_state = "button-warning"; + id = "medbay_access"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + pixel_y = -10; + skin = "-warning" + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "rpn" = ( /obj/structure/sign/warning/vacuum/external/directional/east, /obj/structure/rack, @@ -65103,12 +65230,6 @@ }, /turf/open/floor/iron/white, /area/station/science) -"rrc" = ( -/obj/effect/turf_decal/siding/dark_green, -/obj/item/radio/intercom/command/directional/north, -/obj/machinery/camera/autoname/engineering/directional/north, -/turf/open/floor/circuit/green/telecomms/mainframe, -/area/station/tcommsat/server) "rrj" = ( /obj/structure/cable, /turf/open/floor/iron/dark, @@ -65121,6 +65242,14 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/grass, /area/station/service/hydroponics) +"rrL" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/cable, +/obj/machinery/power/apc/auto_name/directional/east, +/obj/structure/closet/secure_closet/engineering_electrical, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "rrU" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, @@ -65399,6 +65528,14 @@ }, /turf/open/floor/iron/kitchen, /area/station/service/kitchen) +"rws" = ( +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 4 + }, +/obj/structure/cable, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/central/fore) "rwx" = ( /turf/open/floor/iron/dark, /area/station/science/ordnance/storage) @@ -65466,6 +65603,11 @@ /obj/machinery/meter, /turf/open/floor/engine, /area/station/engineering/supermatter) +"rxj" = ( +/obj/machinery/light/small/directional/east, +/obj/machinery/camera/autoname/engineering/directional/east, +/turf/open/floor/plating, +/area/station/terminal/maintenance/aft) "rxl" = ( /obj/item/storage/bag/plants/portaseeder, /obj/item/plant_analyzer, @@ -65691,6 +65833,26 @@ /obj/effect/spawner/random/structure/grille, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"rAR" = ( +/obj/machinery/door/airlock/public/glass{ + name = "Medbay Access"; + id_tag = "medbay_access" + }, +/obj/effect/mapping_helpers/airlock/access/any/science/genetics, +/obj/effect/mapping_helpers/airlock/access/any/medical/general, +/obj/effect/turf_decal/tile/blue/fourcorners, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/segment, +/obj/effect/landmark/navigate_destination/autoname, +/obj/effect/mapping_helpers/airlock/unres, +/obj/effect/turf_decal/caution/stand_clear/blue{ + dir = 1 + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/central) "rAW" = ( /obj/machinery/light/small/directional/east, /obj/machinery/camera/autoname/engineering/directional/east, @@ -66125,6 +66287,11 @@ }, /turf/open/floor/iron/dark, /area/station/security/prison/work) +"rGv" = ( +/obj/structure/ladder, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "rGJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66180,15 +66347,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/wood, /area/station/commons/dorms/room6) -"rHy" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 8 - }, -/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ - dir = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/sorting) "rHF" = ( /obj/effect/turf_decal/tile/brown/half/contrasted{ dir = 8 @@ -66400,13 +66558,6 @@ }, /turf/open/floor/iron/white, /area/station/science/genetics) -"rKh" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/structure/cable/layer3, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "rKl" = ( /obj/effect/turf_decal/siding/dark_green{ dir = 8 @@ -66546,10 +66697,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/virology) -"rMf" = ( -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "rMn" = ( /obj/machinery/seed_extractor, /obj/effect/decal/cleanable/dirt, @@ -66573,19 +66720,6 @@ /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) -"rMJ" = ( -/obj/machinery/door/airlock/engineering{ - name = "Engine Room" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper{ - dir = 1 - }, -/obj/machinery/door/firedoor, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "rMU" = ( /obj/structure/chair{ dir = 1 @@ -66613,12 +66747,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark/small, /area/station/ai/satellite/teleporter) -"rNm" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/vg_decals/numbers/two, -/obj/machinery/camera/autoname/mine/directional/east, -/turf/open/floor/plating/rust/moonstation, -/area/station/cargo/miningelevators) "rNo" = ( /obj/effect/turf_decal/siding/dark, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -66766,13 +66894,6 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) -"rPa" = ( -/obj/machinery/computer/monitor{ - dir = 8 - }, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/engine_smes) "rPb" = ( /obj/machinery/power/terminal{ dir = 8 @@ -66796,14 +66917,6 @@ }, /turf/open/floor/circuit/telecomms, /area/station/ai/satellite/chamber) -"rPz" = ( -/obj/effect/landmark/start/clown, -/obj/machinery/firealarm/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/carpet, -/area/station/commons/lounge) "rPF" = ( /obj/structure/chair/wood, /turf/open/floor/iron/grimy, @@ -66829,6 +66942,16 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/plating, /area/station/maintenance/central) +"rQe" = ( +/obj/structure/window/reinforced/spawner/directional/west, +/obj/machinery/disposal/bin, +/obj/machinery/firealarm/directional/south, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/camera/autoname/engineering/directional/south, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/storage/eva) "rQB" = ( /obj/effect/turf_decal/trimline/red/filled/corner{ dir = 8 @@ -66918,11 +67041,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/workout) -"rRH" = ( -/obj/machinery/atmospherics/pipe/multiz/supply/visible/layer4, -/obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "rRW" = ( /obj/effect/landmark/start/assistant, /turf/open/floor/iron/grimy, @@ -66940,6 +67058,22 @@ /obj/structure/window/reinforced/spawner/directional/east, /turf/open/floor/engine/air, /area/station/ai/satellite/interior) +"rSf" = ( +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail/flip{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/engineering/general, +/turf/open/floor/iron, +/area/station/engineering/break_room) "rSo" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -67075,6 +67209,15 @@ }, /turf/open/floor/wood, /area/station/command/heads_quarters/hos) +"rUy" = ( +/obj/structure/cable, +/obj/effect/turf_decal/stripes/line{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "rUE" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/turf_decal/caution/white, @@ -67128,12 +67271,6 @@ /obj/effect/turf_decal/tile/blue/fourcorners, /turf/open/floor/iron, /area/station/engineering/atmos) -"rVU" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, -/obj/machinery/door/airlock/maintenance_hatch, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/turf/open/floor/plating, -/area/station/engineering/main) "rVV" = ( /obj/structure/window/spawner/directional/west, /obj/effect/turf_decal/siding/dark_green{ @@ -67656,24 +67793,20 @@ /obj/structure/hedge, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) +"sdx" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/junction/flip{ + dir = 8 + }, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/department/engine) "sdy" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/port) -"sdz" = ( -/obj/structure/showcase/cyborg/old{ - dir = 8; - pixel_x = 9; - pixel_y = 2 - }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, -/obj/machinery/status_display/ai/directional/south, -/obj/machinery/light/small/red/directional/east, -/turf/open/floor/circuit/green, -/area/station/ai/upload/chamber) "sdR" = ( /obj/structure/bed, /obj/item/bedsheet/captain, @@ -67912,6 +68045,15 @@ /obj/structure/table/wood/fancy/orange, /turf/open/floor/carpet/red, /area/station/command/heads_quarters/qm) +"shh" = ( +/obj/structure/drain, +/obj/machinery/shower/directional/south, +/obj/effect/turf_decal/trimline/blue/end, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/camera/autoname/engineering/directional/east, +/turf/open/floor/noslip, +/area/station/engineering/atmos/control_center) "shj" = ( /obj/structure/table/wood, /obj/item/book/manual/wiki/security_space_law, @@ -67978,6 +68120,13 @@ /obj/structure/marker_beacon/purple, /turf/open/floor/catwalk_floor/rust/moonstation, /area/moonstation/surface) +"siE" = ( +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/turf/open/floor/catwalk_floor/rust, +/area/station/cargo/miningelevators) "siN" = ( /obj/structure/cable, /obj/structure/disposalpipe/segment{ @@ -68316,6 +68465,12 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"sms" = ( +/obj/effect/turf_decal/siding/dark_green, +/obj/item/radio/intercom/command/directional/north, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/circuit/green/telecomms/mainframe, +/area/station/tcommsat/server) "smH" = ( /turf/closed/wall, /area/station/security/prison/safe) @@ -68344,6 +68499,14 @@ /obj/structure/cable, /turf/open/floor/wood/parquet, /area/station/service/theater) +"snk" = ( +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1; + alpha = 160 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "sno" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -68477,14 +68640,6 @@ }, /turf/open/floor/iron/dark, /area/station/security/office) -"soO" = ( -/obj/effect/turf_decal/tile/dark_green/half/contrasted{ - dir = 1 - }, -/obj/machinery/vending/wardrobe/viro_wardrobe, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/white, -/area/station/medical/virology) "soQ" = ( /obj/machinery/portable_atmospherics/canister/bz, /obj/effect/turf_decal/bot, @@ -68559,6 +68714,16 @@ /obj/structure/cable, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) +"spZ" = ( +/obj/structure/closet/secure_closet/research_director, +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "sqa" = ( /obj/effect/turf_decal/tile/red{ dir = 8 @@ -68671,27 +68836,6 @@ }, /turf/open/floor/iron/large, /area/station/engineering/atmos/hallway) -"srm" = ( -/obj/effect/turf_decal/tile/purple/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/secondary/exit) -"srt" = ( -/obj/machinery/light/directional/south, -/obj/structure/rack, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/clipboard, -/obj/item/radio/intercom/directional/south, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "srx" = ( /obj/effect/turf_decal/tile/green/half/contrasted{ dir = 1 @@ -68793,15 +68937,6 @@ /obj/structure/sign/eyechart/directional/west, /turf/open/floor/iron/white, /area/station/medical/surgery) -"sso" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/machinery/camera/autoname/prison/directional/east, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/security/prison/work) "ssD" = ( /obj/effect/turf_decal/trimline/dark/filled/warning, /obj/structure/sign/poster/official/obey/directional/south, @@ -68893,20 +69028,6 @@ /obj/effect/landmark/generic_maintenance_landmark, /turf/open/floor/plating, /area/station/maintenance/eva_shed) -"sum" = ( -/obj/machinery/light/small/directional/east, -/obj/machinery/camera/autoname/engineering/directional/east, -/turf/open/floor/plating, -/area/station/terminal/maintenance/aft) -"sus" = ( -/obj/machinery/vending/sustenance, -/obj/effect/turf_decal/tile/red/opposingcorners, -/obj/machinery/airalarm/directional/east, -/obj/structure/cable, -/obj/item/radio/intercom/prison/directional/north, -/obj/machinery/camera/autoname/prison/directional/east, -/turf/open/floor/iron/white, -/area/station/security/prison/mess) "suv" = ( /obj/machinery/light/no_nightlight/directional/east, /obj/structure/extinguisher_cabinet/directional/east, @@ -69093,6 +69214,22 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/wood/parquet, /area/station/commons/lounge) +"sxu" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 + }, +/obj/machinery/light/directional/east, +/obj/structure/sign/warning/electric_shock/directional/east, +/obj/machinery/camera/autoname/engineering/directional/east, +/turf/open/floor/engine, +/area/station/engineering/main) +"sxD" = ( +/obj/machinery/power/smes/engineering, +/obj/structure/cable, +/obj/structure/extinguisher_cabinet/directional/west, +/obj/machinery/incident_display/delam/directional/north, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "sxN" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -69116,6 +69253,15 @@ /obj/effect/turf_decal/stripes/corner, /turf/open/floor/iron, /area/station/command/eva) +"sya" = ( +/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/structure/sign/departments/restroom/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/corner, +/area/station/commons/dorms) "syd" = ( /obj/effect/mapping_helpers/apc/full_charge, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -69389,6 +69535,10 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/starboard/aft) +"sCK" = ( +/obj/item/kirbyplants/random/dead, +/turf/open/floor/glass/reinforced/scrape_below, +/area/station/maintenance/aft) "sCR" = ( /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 4 @@ -69409,28 +69559,6 @@ /obj/effect/decal/cleanable/cobweb, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/engine/lower) -"sDg" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/paper/guides/jobs/hydroponics, -/obj/item/seeds/onion, -/obj/item/seeds/garlic, -/obj/item/seeds/potato, -/obj/item/seeds/tomato, -/obj/item/seeds/carrot, -/obj/item/seeds/grass, -/obj/item/seeds/ambrosia, -/obj/item/seeds/wheat, -/obj/item/seeds/pumpkin, -/obj/structure/window/spawner/directional/south, -/obj/effect/decal/cleanable/dirt, -/obj/item/seeds/tower, -/obj/effect/turf_decal/siding/dark, -/obj/item/radio/intercom/prison/directional/west, -/obj/effect/decal/cleanable/dirt, -/obj/effect/spawner/random/contraband/prison, -/obj/machinery/camera/autoname/prison/directional/west, -/turf/open/floor/iron/dark, -/area/station/security/prison/garden) "sDt" = ( /obj/machinery/atmospherics/pipe/smart/simple/dark/visible, /obj/machinery/meter, @@ -69532,10 +69660,6 @@ }, /turf/open/floor/iron, /area/station/security/prison/upper) -"sFm" = ( -/obj/structure/bookcase/manuals/engineering, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) "sFo" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 @@ -69959,21 +70083,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron, /area/station/terminal/interlink) -"sKX" = ( -/obj/effect/turf_decal/trimline/yellow/filled/warning{ - dir = 4 - }, -/obj/effect/turf_decal/stripes/white/line{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/turf/open/floor/iron, -/area/station/engineering/break_room) "sLb" = ( /obj/machinery/conveyor{ id = "mining"; @@ -70047,6 +70156,17 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"sMu" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/cable, +/obj/structure/disposalpipe/sorting/mail{ + dir = 8 + }, +/obj/effect/mapping_helpers/mail_sorting/science/genetics, +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/aft) "sMv" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -70187,6 +70307,10 @@ }, /turf/open/floor/iron/grimy, /area/station/service/library) +"sNU" = ( +/obj/effect/turf_decal/delivery, +/turf/open/floor/plating, +/area/station/maintenance/port) "sNV" = ( /obj/effect/spawner/random/trash/mopbucket, /obj/effect/decal/cleanable/cobweb, @@ -70253,6 +70377,14 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/white, /area/station/medical/virology) +"sPa" = ( +/obj/structure/chair/wood{ + dir = 8 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/carpet/red, +/area/station/commons/lounge) "sPb" = ( /obj/machinery/atmospherics/components/binary/pump/off/supply/visible/layer4{ dir = 8 @@ -70568,6 +70700,18 @@ }, /turf/open/floor/pod, /area/station/cargo/miningfoundry/event_protected) +"sSR" = ( +/obj/machinery/transport/guideway_sensor{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 9 + }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/light/cold/no_nightlight/directional/east, +/obj/structure/sign/warning/docking/directional/east, +/turf/open/floor/plating/rust/moonstation, +/area/station/terminal/tramline) "sST" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70611,6 +70755,12 @@ }, /turf/open/floor/iron/dark, /area/station/service/chapel) +"sTM" = ( +/obj/structure/cable, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/stripes/line, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "sTW" = ( /obj/structure/sign/warning/docking/directional/north, /obj/machinery/light/small/directional/north, @@ -70861,12 +71011,31 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/engineering/atmos) +"sXt" = ( +/obj/machinery/firealarm/directional/north, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/engineering/atmos/hallway) "sXT" = ( /obj/structure/ladder, /obj/structure/sign/calendar/directional/north, /obj/effect/turf_decal/stripes/box, /turf/open/floor/plating, /area/station/cargo/miningfoundry/event_protected) +"sYa" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "sYb" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -71086,13 +71255,6 @@ }, /turf/open/floor/iron, /area/station/cargo/storage) -"taV" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable/layer3, -/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, -/turf/open/floor/engine, -/area/station/engineering/supermatter/room) "tbz" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -71515,6 +71677,18 @@ /obj/effect/turf_decal/bot_red, /turf/open/floor/iron, /area/station/science/ordnance/testlab) +"tfW" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 1 + }, +/obj/machinery/disposal/bin, +/obj/machinery/newscaster/directional/north, +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/north, +/turf/open/floor/iron, +/area/station/commons/storage/tools) "tgd" = ( /obj/machinery/duct, /obj/machinery/light/small/directional/west, @@ -71737,12 +71911,6 @@ /obj/machinery/door/airlock/external/glass, /turf/open/floor/plating, /area/station/maintenance/department/engine/lower) -"tjW" = ( -/obj/structure/cable/multilayer/multiz, -/obj/effect/turf_decal/stripes/end, -/obj/machinery/camera/autoname/mine/directional/north, -/turf/open/floor/plating, -/area/station/cargo/miningelevators) "tjZ" = ( /obj/structure/chair/sofa/bench/tram/left{ dir = 4 @@ -71769,14 +71937,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/plating, /area/station/engineering/storage_shared) -"tkk" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/poddoor/shutters{ - dir = 1; - id = "vaccant_room_shutters" - }, -/turf/open/floor/plating, -/area/station/commons/vacant_room) "tkl" = ( /obj/structure/transport/linear/tram, /obj/structure/tram, @@ -71972,6 +72132,15 @@ /obj/machinery/newscaster/directional/east, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/aft) +"tng" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/white/textured_edge{ + dir = 8 + }, +/area/station/medical/chemistry) "tnk" = ( /obj/effect/mapping_helpers/burnt_floor, /obj/effect/spawner/random/trash/mopbucket, @@ -72096,16 +72265,10 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/plating, /area/station/maintenance/abandon_holding_cell) -"toF" = ( -/obj/structure/sign/warning/docking/directional/west, -/obj/effect/turf_decal/stripes/asteroid/line{ - dir = 6 - }, -/obj/effect/turf_decal/sand/plating, -/obj/machinery/transport/guideway_sensor, -/obj/machinery/light/cold/no_nightlight/directional/west, -/turf/open/floor/plating/rust/moonstation, -/area/moonstation/surface) +"toH" = ( +/obj/effect/spawner/random/burgerstation/loot, +/turf/open/floor/iron/cafeteria, +/area/station/maintenance/port/aft) "toP" = ( /obj/machinery/atmospherics/pipe/smart/manifold/yellow/visible{ dir = 1 @@ -72433,6 +72596,12 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/starboard/fore) +"tsV" = ( +/obj/machinery/atmospherics/components/unary/outlet_injector/monitored/incinerator_input{ + dir = 4 + }, +/turf/open/floor/engine/airless, +/area/station/maintenance/disposal/incinerator) "tsZ" = ( /obj/structure/closet/secure_closet/personal/wall{ pixel_x = -25 @@ -72544,6 +72713,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /turf/open/floor/engine, /area/station/engineering/supermatter) +"ttZ" = ( +/obj/machinery/light/small/directional/east, +/obj/effect/turf_decal/vg_decals/numbers/two, +/obj/machinery/camera/autoname/mine/directional/east, +/turf/open/floor/plating/rust/moonstation, +/area/station/cargo/miningelevators) "tug" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -72757,14 +72932,6 @@ }, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) -"txl" = ( -/obj/machinery/power/apc/auto_name/directional/west, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/machinery/camera/autoname/engineering/directional/west, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "txA" = ( /obj/structure/chair/office{ dir = 4 @@ -72781,14 +72948,6 @@ /obj/machinery/holopad/secure, /turf/open/floor/wood, /area/station/commons/dorms/room7) -"txL" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/obj/structure/cable/layer3, -/turf/open/floor/iron/dark, -/area/station/engineering/main) "txO" = ( /obj/effect/decal/cleanable/dirt/dust, /obj/machinery/light/small/directional/north, @@ -72797,15 +72956,6 @@ "txR" = ( /turf/open/floor/carpet/cyan, /area/station/command/heads_quarters/cmo) -"txU" = ( -/obj/effect/mapping_helpers/airlock/access/all/science/rd, -/obj/structure/plasticflaps/kitchen, -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/machinery/door/airlock/command/glass{ - name = "Server Access" - }, -/turf/open/floor/plating, -/area/station/science/server) "txV" = ( /obj/structure/cable, /obj/effect/decal/cleanable/dirt/dust, @@ -72840,14 +72990,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/cargo/lobby) -"tyw" = ( -/obj/effect/turf_decal/tile/neutral/fourcorners, -/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ - dir = 8 - }, -/obj/machinery/light_switch/directional/east, -/turf/open/floor/iron/dark, -/area/station/science/server) "tyA" = ( /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/engine, @@ -73068,6 +73210,13 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark, /area/station/commons/lounge) +"tBP" = ( +/obj/structure/rack/shelf, +/obj/effect/spawner/random/techstorage/tcomms_all, +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/plating, +/area/station/engineering/storage/tcomms) "tBR" = ( /obj/effect/turf_decal/stripes/asteroid/line{ dir = 4 @@ -73158,6 +73307,11 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) +"tCH" = ( +/obj/effect/spawner/random/decoration/glowstick, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "tCI" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -73173,9 +73327,6 @@ "tCM" = ( /turf/closed/wall, /area/station/security/warden) -"tCP" = ( -/turf/open/floor/plating/foam, -/area/station/maintenance/department/engine) "tCS" = ( /turf/open/floor/catwalk_floor/iron_dark, /area/station/science/ordnance/testlab) @@ -73277,6 +73428,13 @@ }, /turf/open/floor/iron/dark, /area/station/command/gateway) +"tDV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "tDY" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/wood, @@ -73442,6 +73600,11 @@ /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, /area/station/maintenance/department/crew_quarters/bar) +"tFO" = ( +/obj/effect/spawner/random/burgerstation/loot, +/obj/machinery/light/small/red/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/disposal) "tFQ" = ( /obj/machinery/light/directional/west, /obj/effect/spawner/random/burgerstation/atmos, @@ -73598,6 +73761,19 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, /area/station/security/checkpoint/customs) +"tId" = ( +/obj/structure/showcase/cyborg/old{ + dir = 8; + pixel_x = 9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/light/small/red/directional/east, +/turf/open/floor/circuit/green, +/area/station/ai/upload/chamber) "tIg" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/light/small/red/directional/south, @@ -74079,6 +74255,11 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark/herringbone, /area/station/security/lockers) +"tNV" = ( +/obj/effect/decal/cleanable/cobweb/cobweb2, +/obj/structure/ladder, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "tOa" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 4 @@ -74383,6 +74564,11 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/port) +"tSa" = ( +/obj/machinery/firealarm/directional/north, +/obj/machinery/light/directional/north, +/turf/open/floor/plating, +/area/station/commons/vacant_room) "tSk" = ( /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/plating, @@ -74555,13 +74741,6 @@ }, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"tUL" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted, -/obj/structure/disposalpipe/junction/yjunction{ - dir = 8 - }, -/turf/open/floor/iron/dark/corner, -/area/station/engineering/atmos/hallway) "tUO" = ( /obj/machinery/door/airlock/maintenance, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -74740,30 +74919,9 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine/atmos) -"tXq" = ( -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/effect/mapping_helpers/airlock/cyclelink_helper, -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring" - }, -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 - }, -/turf/open/floor/iron/dark/side, -/area/station/engineering/storage) "tXv" = ( /turf/open/floor/iron/dark, /area/station/engineering/atmos/hfr_room) -"tXC" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/sorting/wrap/flip{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "tXD" = ( /obj/structure/closet/crate, /obj/item/food/breadslice/plain, @@ -74807,16 +74965,6 @@ /obj/effect/spawner/random/burgerstation/loot, /turf/open/floor/plating, /area/station/maintenance/night_club) -"tYn" = ( -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/sorting/mail/flip{ - dir = 1 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "tYp" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -75242,6 +75390,16 @@ /obj/machinery/holopad, /turf/open/floor/iron, /area/station/engineering/atmos) +"ufx" = ( +/obj/effect/turf_decal/tile/blue/half/contrasted{ + dir = 8 + }, +/obj/item/radio/intercom/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/iron/dark/corner{ + dir = 1 + }, +/area/station/hallway/primary/starboard) "ufB" = ( /obj/effect/turf_decal/tile/blue, /obj/effect/turf_decal/tile/neutral{ @@ -75523,6 +75681,18 @@ }, /turf/open/floor/grass, /area/station/commons/public_xenoarch) +"uix" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 8 + }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/turf/open/floor/iron, +/area/station/engineering/break_room) "uiy" = ( /obj/effect/turf_decal/stripes/line, /obj/machinery/camera/autoname/directional/south, @@ -75603,6 +75773,16 @@ /obj/effect/turf_decal/vg_decals/atmos/nitrogen, /turf/open/floor/engine/n2, /area/station/engineering/atmos) +"ujo" = ( +/obj/machinery/power/apc/auto_name/directional/west, +/obj/structure/cable, +/obj/structure/railing{ + dir = 1 + }, +/obj/effect/mapping_helpers/apc/cell_10k, +/obj/effect/mapping_helpers/apc/full_charge, +/turf/open/floor/catwalk_floor/rust, +/area/station/cargo/miningelevators) "uju" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, @@ -75720,16 +75900,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/iron, /area/station/command/eva) -"ulD" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/turf/open/floor/iron, -/area/station/cargo/warehouse) "ulH" = ( /turf/closed/wall/r_wall/rust, /area/station/security/corrections_officer) @@ -75826,15 +75996,6 @@ }, /turf/open/floor/wood, /area/station/maintenance/abandon_psych) -"unb" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 4 - }, -/obj/structure/cable, -/turf/open/floor/iron/dark, -/area/station/science/ordnance) "unp" = ( /obj/structure/stone_tile/block/cracked, /obj/structure/stone_tile/block{ @@ -75864,16 +76025,6 @@ }, /turf/open/floor/iron, /area/station/engineering/atmos) -"unz" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 5 - }, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "unD" = ( /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, @@ -75920,15 +76071,6 @@ /obj/item/radio/intercom/directional/south, /turf/open/floor/iron, /area/station/engineering/atmos) -"unO" = ( -/obj/item/radio/intercom/directional/east, -/obj/machinery/digital_clock/directional/north, -/obj/effect/landmark/start/hangover, -/obj/effect/turf_decal/bot, -/obj/machinery/light/small/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central/fore) "unS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, /obj/structure/cable, @@ -76301,16 +76443,6 @@ }, /turf/open/floor/iron/dark, /area/station/medical/surgery) -"utm" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/iron/white, -/area/station/command/heads_quarters/cmo) "utp" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 @@ -76379,18 +76511,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/aft) -"uuA" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 1 - }, -/obj/machinery/firealarm/directional/south, -/obj/machinery/disposal/bin, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark, -/area/station/engineering/atmos/hallway) "uuB" = ( /obj/structure/railing/corner{ dir = 1 @@ -76894,15 +77014,6 @@ /obj/machinery/camera/autoname/directional/east, /turf/open/floor/iron/dark/small, /area/station/command/bridge) -"uCa" = ( -/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ - dir = 8 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/primary/central/fore) "uCf" = ( /obj/structure/sink/directional/east, /obj/structure/mirror/directional/west, @@ -77329,6 +77440,11 @@ /obj/item/radio/intercom/directional/west, /turf/open/floor/iron/dark, /area/station/common/night_club) +"uIa" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron/dark/corner, +/area/station/hallway/primary/starboard) "uIe" = ( /obj/structure/chair/sofa/corp/left{ desc = "Looks like someone threw it out. Covered in donut crumbs."; @@ -77344,11 +77460,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine/atmos) -"uIm" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, -/obj/effect/landmark/firealarm_sanity, -/turf/open/floor/iron/dark/telecomms, -/area/station/science/server) "uIn" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 1 @@ -77493,10 +77604,6 @@ }, /turf/open/indestructible/boss, /area/lavaland/surface/outdoors) -"uKe" = ( -/obj/structure/cable, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/supermatter/room) "uKl" = ( /obj/structure/ore_box, /turf/open/floor/plating, @@ -77511,6 +77618,19 @@ /obj/item/reagent_containers/spray/cleaner, /turf/open/floor/iron/white, /area/station/medical/virology) +"uKK" = ( +/obj/machinery/computer/mecha{ + dir = 8 + }, +/obj/machinery/newscaster/directional/east, +/obj/effect/turf_decal/siding/dark{ + dir = 1 + }, +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "uKX" = ( /obj/machinery/door/airlock/hatch, /turf/open/floor/plating, @@ -77587,6 +77707,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron, /area/station/security/prison/upper) +"uLT" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/effect/landmark/firealarm_sanity, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/server) "uMg" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, @@ -77613,26 +77739,6 @@ /obj/effect/spawner/random/trash/graffiti, /turf/open/floor/wood, /area/station/service/library/abandoned) -"uMz" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/white/textured_edge{ - dir = 8 - }, -/area/station/medical/chemistry) -"uMI" = ( -/obj/machinery/hydroponics/constructable, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/obj/effect/spawner/random/food_or_drink/seed, -/obj/machinery/light/directional/north, -/obj/machinery/firealarm/directional/north, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/grass, -/area/station/service/hydroponics/garden) "uMT" = ( /obj/machinery/ai_slipper, /obj/structure/cable, @@ -77658,6 +77764,15 @@ /obj/machinery/door/firedoor, /turf/open/floor/iron/dark/herringbone, /area/station/medical/morgue) +"uNl" = ( +/obj/machinery/button/transport/tram/directional/south{ + id = 1; + specific_transport_id = "moon_1" + }, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/obj/machinery/camera/autoname/directional/south, +/turf/open/floor/iron, +/area/station/terminal/lobby) "uNu" = ( /obj/machinery/airalarm/directional/south, /obj/effect/turf_decal/tile/green/half/contrasted, @@ -77703,16 +77818,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/dark, /area/station/security/eva) -"uNY" = ( -/obj/machinery/airalarm/directional/south, -/obj/item/kirbyplants/random/fullysynthetic, -/obj/machinery/camera/autoname/aiupload/directional/south, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/caution/stand_clear/red, -/turf/open/floor/iron/dark/small, -/area/station/ai/upload/chamber) "uOa" = ( /obj/effect/turf_decal/tile/red/half/contrasted, /obj/effect/mapping_helpers/broken_floor, @@ -77777,18 +77882,6 @@ /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, /area/station/maintenance/gag_room) -"uOU" = ( -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/iron/dark, -/area/station/cargo/storage) "uPp" = ( /obj/structure/flora/bush/sparsegrass/style_random, /obj/machinery/seed_extractor, @@ -77839,14 +77932,6 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2, /turf/open/floor/iron, /area/station/hallway/primary/central/fore) -"uQo" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 10 - }, -/obj/item/kirbyplants/random, -/obj/machinery/light_switch/directional/south, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "uQp" = ( /obj/machinery/door/airlock/mining/glass{ name = "Mining Dock" @@ -77942,6 +78027,13 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"uRU" = ( +/obj/machinery/computer/atmos_alert/station_only{ + dir = 8 + }, +/obj/structure/sign/poster/random/directional/east, +/turf/open/floor/iron/dark, +/area/station/engineering/engine_smes) "uSe" = ( /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron/dark/corner, @@ -78031,15 +78123,6 @@ /obj/machinery/computer/security/telescreen/entertainment/directional/south, /turf/open/floor/wood, /area/station/hallway/primary/central/aft) -"uTk" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/starboard) "uTm" = ( /obj/item/storage/box/coffeepack{ pixel_x = 15; @@ -78362,6 +78445,19 @@ /obj/effect/turf_decal/trimline/white/arrow_ccw, /turf/open/floor/iron/white, /area/station/medical/medbay/central) +"uWZ" = ( +/obj/structure/cable, +/obj/machinery/power/terminal{ + dir = 1 + }, +/obj/effect/turf_decal/stripes/line{ + dir = 9 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "uXa" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78371,16 +78467,6 @@ }, /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/department/medical/chemistry) -"uXd" = ( -/obj/structure/table, -/obj/effect/spawner/random/engineering/toolbox, -/obj/effect/turf_decal/tile/purple/half/contrasted{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/north, -/obj/machinery/light/directional/north, -/turf/open/floor/iron/white, -/area/station/science/lab) "uXe" = ( /obj/effect/turf_decal/siding/purple{ dir = 1 @@ -78411,6 +78497,15 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/security/prison/upper) +"uXv" = ( +/obj/effect/mapping_helpers/burnt_floor, +/obj/effect/spawner/random/decoration/glowstick, +/obj/effect/turf_decal/delivery, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/maintenance/port/aft) "uXw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78463,6 +78558,18 @@ /obj/item/restraints/handcuffs, /turf/open/floor/iron/dark, /area/station/security/prison) +"uYj" = ( +/obj/effect/turf_decal/tile/purple/half/contrasted{ + dir = 1 + }, +/obj/machinery/newscaster/directional/north, +/obj/structure/bookcase/manuals/research_and_development, +/obj/item/toy/figure/scientist{ + pixel_x = -10; + pixel_y = 18 + }, +/turf/open/floor/iron/white, +/area/station/science/lab) "uYn" = ( /obj/structure/toilet/greyscale{ dir = 1 @@ -78494,18 +78601,15 @@ /obj/machinery/light/small/directional/south, /turf/open/floor/wood, /area/station/commons/dorms/room2) -"uYI" = ( -/obj/effect/turf_decal/tile/yellow/half/contrasted{ - dir = 1 +"uYT" = ( +/obj/effect/turf_decal/siding/dark{ + dir = 8 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/camera/autoname/directional/north, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/engineering/atmos/hallway) +/obj/structure/cable, +/obj/machinery/vending/cigarette, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark, +/area/station/commons/public_dock) "uZb" = ( /turf/open/floor/glass/reinforced/scrape_below, /area/station/security/courtroom) @@ -78948,16 +79052,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/starboard) -"vfE" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ - dir = 8 - }, -/obj/effect/turf_decal/trimline/white/arrow_ccw{ - dir = 8 - }, -/obj/structure/sign/warning/no_smoking/directional/west, -/turf/open/floor/iron/white, -/area/station/medical/medbay/central) "vfG" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -79111,19 +79205,6 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /turf/open/floor/iron, /area/station/engineering/atmos/pumproom) -"viG" = ( -/obj/machinery/light/directional/east, -/obj/effect/turf_decal/stripes/line{ - dir = 4 - }, -/obj/machinery/status_display/evac/directional/east, -/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/secondary/exit/departure_lounge) "viL" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -79161,11 +79242,6 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/iron/checker, /area/station/hallway/primary/central/fore) -"vjq" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted, -/obj/machinery/holopad, -/turf/open/floor/iron/showroomfloor, -/area/station/medical/chemistry) "vjw" = ( /obj/structure/disposalpipe/segment{ dir = 5 @@ -79252,12 +79328,6 @@ }, /turf/open/floor/engine, /area/station/engineering/atmos/project) -"vlv" = ( -/obj/machinery/light/small/directional/east, -/obj/effect/turf_decal/vg_decals/numbers/two, -/obj/machinery/camera/autoname/mine/directional/east, -/turf/open/floor/plating/rust/moonstation, -/area/station/commons/public_mining) "vlw" = ( /obj/effect/turf_decal/caution/stand_clear/white, /obj/effect/turf_decal/sand/plating/volcanic, @@ -79613,6 +79683,12 @@ }, /turf/open/floor/engine, /area/station/science/robotics) +"vpi" = ( +/obj/machinery/vending/tool, +/obj/machinery/firealarm/directional/west, +/obj/machinery/camera/autoname/engineering/directional/west, +/turf/open/floor/engine, +/area/station/engineering/storage_shared) "vpk" = ( /turf/open/lava/smooth/lava_land_surface, /area/lavaland/surface/outdoors) @@ -80054,6 +80130,16 @@ /obj/machinery/iv_drip, /turf/open/floor/iron/white, /area/station/medical/treatment_center) +"vwn" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/spawner/random/maintenance, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "vwo" = ( /obj/effect/turf_decal/tile/dark_blue{ dir = 8 @@ -80223,6 +80309,16 @@ }, /turf/open/misc/moonstation_sand, /area/moonstation/surface) +"vyC" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/effect/turf_decal/tile/brown/anticorner/contrasted{ + dir = 1 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/cargo/sorting) "vyE" = ( /obj/effect/turf_decal/tile/green{ dir = 8 @@ -80540,11 +80636,6 @@ /obj/machinery/door/airlock/maintenance_hatch, /turf/open/floor/plating, /area/station/security/checkpoint/customs) -"vCw" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "vCy" = ( /obj/machinery/status_display/ai/directional/north, /obj/structure/sign/departments/aiupload/directional/east, @@ -80869,6 +80960,11 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet, /area/station/service/chapel) +"vGf" = ( +/obj/machinery/light/cold/directional/south, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark/telecomms, +/area/station/science/server) "vGh" = ( /obj/effect/spawner/random/structure/steam_vent, /turf/open/floor/plating, @@ -80998,15 +81094,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/checker, /area/station/cargo/blacksmith) -"vJD" = ( -/obj/machinery/light/directional/east, -/obj/structure/cable/multilayer/connected, -/obj/item/radio/intercom/directional/east, -/obj/machinery/computer/atmos_alert/station_only{ - dir = 8 - }, -/turf/open/floor/catwalk_floor/iron_dark, -/area/station/engineering/engine_smes) "vJG" = ( /obj/effect/turf_decal/siding/purple{ dir = 4 @@ -81100,16 +81187,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/aft) -"vKC" = ( -/obj/machinery/power/terminal{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/stripes/line{ - dir = 9 - }, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "vKD" = ( /obj/structure/railing, /obj/effect/turf_decal/caution{ @@ -81184,6 +81261,33 @@ /obj/structure/chair/stool/bamboo, /turf/open/floor/bamboo, /area/station/maintenance/abandon_wrestle) +"vMs" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/shutters/preopen{ + dir = 8; + id = "medsecprivacy"; + name = "Privacy Shutters" + }, +/turf/open/floor/plating, +/area/station/security/checkpoint/medical) +"vMv" = ( +/obj/machinery/computer/crew{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue/anticorner/contrasted{ + dir = 8 + }, +/obj/machinery/camera/autoname/directional/south, +/obj/machinery/button/door/directional/south{ + icon_state = "button-warning"; + id = "medbay_access"; + name = "Medbay Doors Control"; + normaldoorcontrol = 1; + req_access = list("medical"); + skin = "-warning" + }, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "vMw" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/disposalpipe/segment, @@ -81496,6 +81600,13 @@ "vQH" = ( /turf/closed/wall, /area/station/commons/vacant_room) +"vQJ" = ( +/obj/effect/turf_decal/tile/yellow/half/contrasted{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron, +/area/station/engineering/break_room) "vQO" = ( /obj/effect/turf_decal/delivery, /obj/effect/landmark/navigate_destination/hop, @@ -81671,6 +81782,15 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/secondary/exit/departure_lounge) +"vTe" = ( +/obj/machinery/computer/robotics{ + dir = 8 + }, +/obj/machinery/computer/security/telescreen/rd/directional/east, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/effect/turf_decal/tile/purple/anticorner/contrasted, +/turf/open/floor/iron/dark, +/area/station/command/heads_quarters/rd) "vTm" = ( /obj/structure/table, /obj/item/exodrone{ @@ -81722,6 +81842,10 @@ planetary_atmos = 0 }, /area/moonstation/underground) +"vTL" = ( +/obj/machinery/restaurant_portal/bar, +/turf/open/floor/wood, +/area/station/commons/lounge) "vTP" = ( /obj/machinery/door/airlock/security/glass{ name = "Security E.V.A. Storage" @@ -81804,6 +81928,18 @@ /obj/item/hand_labeler, /turf/open/floor/iron/dark, /area/station/command/bridge) +"vVf" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/purple{ + dir = 4 + }, +/obj/item/xenoarch/tape_measure, +/obj/item/storage/toolbox/mechanical{ + pixel_y = 12 + }, +/obj/machinery/camera/autoname/mine/directional/east, +/turf/open/floor/plastic, +/area/station/commons/public_xenoarch) "vVp" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -82265,15 +82401,6 @@ }, /turf/open/floor/engine, /area/station/engineering/main) -"wau" = ( -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/obj/machinery/light/directional/east, -/obj/structure/sign/warning/electric_shock/directional/east, -/obj/machinery/camera/autoname/engineering/directional/east, -/turf/open/floor/engine, -/area/station/engineering/main) "way" = ( /obj/structure/window/reinforced/survival_pod/spawner/directional/west, /obj/structure/flora/ocean/longseaweed, @@ -82390,6 +82517,12 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/engineering/atmos/control_center) +"wcs" = ( +/obj/effect/mapping_helpers/broken_floor, +/obj/effect/spawner/random/trash/hobo_squat, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_smooth, +/area/station/maintenance/department/engine/lower) "wcy" = ( /obj/docking_port/stationary{ dwidth = 11; @@ -82482,6 +82615,12 @@ /obj/structure/drain, /turf/open/floor/iron/white, /area/station/security/prison/shower) +"weg" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/cable, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/supermatter/room) "wem" = ( /obj/effect/turf_decal/tile/neutral/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -82764,6 +82903,13 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"whV" = ( +/obj/effect/turf_decal/stripes/line{ + dir = 8 + }, +/obj/machinery/airalarm/directional/west, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "wid" = ( /obj/machinery/atmospherics/components/unary/thermomachine/freezer, /obj/machinery/airalarm/directional/north, @@ -82977,13 +83123,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"wkz" = ( -/obj/effect/turf_decal/stripes/line{ - dir = 6 - }, -/obj/structure/closet/secure_closet/engineering_electrical, -/turf/open/floor/engine, -/area/station/engineering/engine_smes) "wkA" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, @@ -83101,18 +83240,6 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/white, /area/station/science/lab) -"wmh" = ( -/obj/machinery/firealarm/directional/east, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/structure/cable, -/obj/structure/table/wood, -/obj/machinery/coffeemaker/impressa{ - pixel_y = 3; - pixel_x = 3 - }, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/wood, -/area/station/service/bar) "wmo" = ( /obj/effect/spawner/structure/window, /turf/open/floor/plating, @@ -83271,6 +83398,22 @@ /obj/structure/cable, /turf/open/floor/iron, /area/station/security/prison/upper) +"wpb" = ( +/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ + dir = 4 + }, +/obj/effect/spawner/random/burgerstation/power, +/obj/effect/turf_decal/tile/yellow{ + dir = 4 + }, +/obj/effect/turf_decal/tile/blue{ + dir = 1 + }, +/obj/structure/cable, +/obj/effect/turf_decal/siding/dark, +/obj/machinery/camera/autoname/engineering/directional/north, +/turf/open/floor/iron, +/area/station/engineering/atmos/project) "wph" = ( /obj/effect/mapping_helpers/airlock/cyclelink_helper{ dir = 4 @@ -83302,6 +83445,12 @@ /obj/machinery/portable_atmospherics/scrubber, /turf/open/floor/plating, /area/station/terminal/maintenance/aft) +"wpB" = ( +/obj/structure/cable, +/obj/machinery/status_display/evac/directional/south, +/obj/machinery/power/port_gen/pacman/pre_loaded, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/engine_smes) "wpD" = ( /obj/effect/mapping_helpers/broken_floor, /obj/effect/decal/cleanable/dirt/dust, @@ -83443,6 +83592,16 @@ dir = 4 }, /area/station/commons/lounge) +"wsd" = ( +/obj/structure/sign/warning/docking/directional/west, +/obj/effect/turf_decal/stripes/asteroid/line{ + dir = 6 + }, +/obj/effect/turf_decal/sand/plating, +/obj/machinery/transport/guideway_sensor, +/obj/machinery/light/cold/no_nightlight/directional/west, +/turf/open/floor/plating/rust/moonstation, +/area/station/terminal/tramline) "wsf" = ( /obj/item/reagent_containers/cup/glass/mug{ pixel_x = 13; @@ -83809,14 +83968,6 @@ /obj/structure/steps/directional/south, /turf/open/floor/plating, /area/station/maintenance/department/engine/shuttle_construction_bay) -"wxH" = ( -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/obj/machinery/door/airlock/medical{ - name = "Operating Room" - }, -/obj/machinery/door/firedoor, -/turf/open/floor/iron/white, -/area/station/medical/surgery) "wxS" = ( /obj/machinery/light/small/red/directional/west, /obj/structure/sign/warning/radiation/directional/west, @@ -83881,6 +84032,15 @@ /obj/machinery/camera/autoname/science/directional/east, /turf/open/floor/iron/dark, /area/station/science/robotics) +"wyI" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/disposalpipe/junction/yjunction{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/fore) "wyO" = ( /obj/effect/turf_decal/siding/wideplating_new/dark, /obj/effect/turf_decal/tile/neutral/half/contrasted{ @@ -84218,15 +84378,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/iron, /area/station/cargo/storage) -"wDg" = ( -/obj/structure/drain, -/obj/machinery/shower/directional/south, -/obj/effect/turf_decal/trimline/blue/end, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/siding/dark, -/obj/machinery/camera/autoname/engineering/directional/east, -/turf/open/floor/noslip, -/area/station/engineering/atmos/control_center) "wDl" = ( /obj/effect/spawner/structure/window/reinforced/plasma, /turf/open/floor/plating, @@ -84399,18 +84550,6 @@ dir = 1 }, /area/station/cargo/bitrunning/den) -"wFT" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Medbay" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/yellow/warning, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/turf/open/floor/iron/white/side, -/area/station/medical/medbay/lobby) "wGb" = ( /obj/structure/sign/warning/cold_temp/directional/south, /obj/effect/turf_decal/siding/blue{ @@ -84546,6 +84685,16 @@ }, /turf/open/floor/iron/dark, /area/station/maintenance/night_club) +"wHP" = ( +/obj/machinery/airalarm/directional/south, +/obj/item/kirbyplants/random/fullysynthetic, +/obj/machinery/camera/autoname/aiupload/directional/south, +/obj/effect/turf_decal/stripes/red/line{ + dir = 1 + }, +/obj/effect/turf_decal/caution/stand_clear/red, +/turf/open/floor/iron/dark/small, +/area/station/ai/upload/chamber) "wHW" = ( /obj/effect/turf_decal/tile/brown/fourcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84633,19 +84782,6 @@ /obj/structure/cable, /turf/open/floor/iron/dark, /area/station/medical/surgery) -"wIP" = ( -/obj/machinery/door/airlock/public/glass{ - name = "Medbay" - }, -/obj/effect/turf_decal/tile/blue/fourcorners, -/obj/machinery/door/firedoor, -/obj/effect/turf_decal/trimline/yellow/warning, -/obj/effect/turf_decal/trimline/yellow/warning{ - dir = 1 - }, -/obj/structure/disposalpipe/segment, -/turf/open/floor/iron/white/side, -/area/station/medical/medbay/lobby) "wIV" = ( /obj/structure/sign/warning/directional/south, /turf/open/openspace/moonstation, @@ -84743,13 +84879,6 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) -"wJV" = ( -/obj/structure/closet/secure_closet/research_director, -/obj/effect/turf_decal/siding/dark{ - dir = 8 - }, -/turf/open/floor/iron/dark, -/area/station/command/heads_quarters/rd) "wKa" = ( /obj/effect/turf_decal/siding/dark{ dir = 1 @@ -84767,6 +84896,17 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/department/engine/lower) +"wKl" = ( +/obj/machinery/door/poddoor/shutters{ + id = "qm_warehouse"; + name = "Warehouse Shutters" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/brown/half/contrasted{ + dir = 1 + }, +/turf/open/floor/iron/dark/side, +/area/station/cargo/warehouse) "wKw" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -84827,23 +84967,24 @@ /obj/effect/landmark/start/hangover, /turf/open/floor/carpet/red, /area/station/commons/dorms/room2) +"wLE" = ( +/obj/machinery/atmospherics/components/unary/thermomachine/freezer/on{ + dir = 8 + }, +/obj/machinery/light_switch/directional/east, +/obj/effect/turf_decal/tile/neutral/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/science/server) +"wLG" = ( +/obj/machinery/holopad, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "wLJ" = ( /obj/effect/turf_decal/weather/snow, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) -"wLO" = ( -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/east, -/obj/effect/mapping_helpers/apc/cell_10k, -/obj/effect/mapping_helpers/apc/full_charge, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/obj/machinery/camera/autoname/mine/directional/east, -/turf/open/misc/grass/jungle, -/area/station/biodome) "wLU" = ( /obj/effect/turf_decal/tile/holiday/rainbow{ dir = 1 @@ -84946,6 +85087,11 @@ }, /turf/open/floor/iron/grimy, /area/station/service/bar) +"wNO" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "wNW" = ( /obj/effect/mapping_helpers/airlock/access/all/security/general, /obj/machinery/door/firedoor, @@ -84976,22 +85122,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/command/cc_dock) -"wOh" = ( -/obj/machinery/atmospherics/pipe/smart/simple/yellow/visible{ - dir = 4 - }, -/obj/effect/spawner/random/burgerstation/power, -/obj/effect/turf_decal/tile/yellow{ - dir = 4 - }, -/obj/effect/turf_decal/tile/blue{ - dir = 1 - }, -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark, -/obj/machinery/camera/autoname/engineering/directional/north, -/turf/open/floor/iron, -/area/station/engineering/atmos/project) "wOj" = ( /turf/closed/wall, /area/station/commons/storage/emergency/port) @@ -85075,6 +85205,15 @@ /obj/structure/cable/multilayer/multiz, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"wPB" = ( +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4; + alpha = 160 + }, +/turf/open/floor/iron/white/smooth_edge{ + dir = 4 + }, +/area/station/medical/medbay/lobby) "wPD" = ( /obj/effect/turf_decal/tile/green/half/contrasted, /obj/structure/disposalpipe/segment{ @@ -85255,6 +85394,12 @@ "wRS" = ( /turf/open/floor/plating, /area/station/engineering/supermatter/emitter) +"wRY" = ( +/obj/structure/cable, +/obj/item/kirbyplants/random, +/obj/machinery/light/directional/north, +/turf/open/floor/catwalk_floor/iron_dark, +/area/station/engineering/engine_smes) "wSa" = ( /obj/effect/mapping_helpers/airlock/access/all/supply/shipping, /obj/effect/turf_decal/tile/brown/fourcorners, @@ -85328,15 +85473,6 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron, /area/station/engineering/break_room) -"wTa" = ( -/obj/machinery/button/transport/tram/directional/south{ - id = 1; - specific_transport_id = "moon_1" - }, -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron, -/area/station/terminal/lobby) "wTd" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -85449,6 +85585,16 @@ }, /turf/open/floor/iron/dark, /area/station/security/brig) +"wUD" = ( +/obj/machinery/conveyor_switch/oneway{ + id = "cargodisposals"; + name = "disposals conveyor switch"; + pixel_x = -10 + }, +/obj/effect/turf_decal/siding/dark, +/obj/structure/disposalpipe/segment, +/turf/open/floor/iron/dark, +/area/station/cargo/sorting) "wUF" = ( /obj/machinery/icecream_vat, /obj/effect/turf_decal/weather/snow, @@ -86115,11 +86261,6 @@ "xdR" = ( /turf/closed/wall/r_wall, /area/station/maintenance/disposal/incinerator) -"xdW" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted, -/obj/machinery/camera/autoname/directional/south, -/turf/open/floor/iron/dark/corner, -/area/station/hallway/primary/port) "xdZ" = ( /obj/structure/railing{ dir = 8 @@ -86370,11 +86511,6 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/plating, /area/station/maintenance/department/chapel) -"xhk" = ( -/obj/machinery/airalarm/directional/south, -/obj/machinery/light/directional/south, -/turf/open/floor/plating, -/area/station/commons/vacant_room) "xhn" = ( /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, /obj/effect/turf_decal/siding/dark{ @@ -86515,6 +86651,21 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/dark, /area/station/security/brig) +"xjG" = ( +/obj/structure/showcase/cyborg/old{ + dir = 4; + pixel_x = -9; + pixel_y = 2 + }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 1 + }, +/obj/structure/cable, +/obj/machinery/status_display/ai/directional/south, +/obj/machinery/firealarm/directional/west, +/obj/machinery/light/small/red/directional/west, +/turf/open/floor/circuit/green, +/area/station/ai/upload/chamber) "xjL" = ( /obj/machinery/atmospherics/pipe/multiz/scrubbers/visible/layer2{ dir = 4 @@ -86607,21 +86758,6 @@ /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) -"xlf" = ( -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/cargo/miningelevators) -"xlo" = ( -/obj/machinery/door/airlock/engineering/glass{ - name = "Power Monitoring" - }, -/obj/effect/mapping_helpers/airlock/access/all/engineering/general, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/obj/structure/disposalpipe/segment, -/obj/effect/turf_decal/tile/yellow/fourcorners, -/turf/open/floor/iron, -/area/station/engineering/storage) "xlq" = ( /obj/effect/turf_decal/trimline/yellow/filled/warning, /obj/effect/turf_decal/stripes/white/line, @@ -86933,6 +87069,14 @@ }, /turf/open/floor/iron/checker, /area/station/hallway/primary/port) +"xpJ" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/poddoor/shutters{ + dir = 1; + id = "vaccant_room_shutters" + }, +/turf/open/floor/plating, +/area/station/commons/vacant_room) "xpQ" = ( /obj/structure/fluff/tram_rail/electric{ dir = 1 @@ -86942,6 +87086,15 @@ }, /turf/open/floor/plating, /area/station/hallway/primary/tram/left) +"xpS" = ( +/obj/machinery/firealarm/directional/south, +/obj/effect/turf_decal/tile/yellow{ + dir = 8 + }, +/obj/effect/turf_decal/tile/blue, +/obj/machinery/camera/autoname/engineering/directional/south, +/turf/open/floor/iron, +/area/station/engineering/atmos) "xqj" = ( /obj/structure/bookcase/random/nonfiction, /obj/effect/turf_decal/siding/dark{ @@ -87068,6 +87221,11 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/primary/central/aft) +"xrP" = ( +/obj/machinery/digital_clock/directional/west, +/obj/machinery/camera/autoname/directional/west, +/turf/open/floor/wood, +/area/station/command/meeting_room) "xrS" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -87222,14 +87380,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/iron/checker, /area/station/commons/dorms) -"xuc" = ( -/obj/effect/turf_decal/tile/brown/half/contrasted{ - dir = 4 - }, -/obj/machinery/light/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron, -/area/station/cargo/storage) "xun" = ( /obj/machinery/atmospherics/pipe/smart/manifold/scrubbers/visible, /obj/effect/turf_decal/tile/yellow/opposingcorners{ @@ -87287,6 +87437,15 @@ }, /turf/open/floor/iron/dark, /area/station/hallway/secondary/exit/departure_lounge) +"xvt" = ( +/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/machinery/door/airlock/medical{ + name = "Operating Room" + }, +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/tile/blue/fourcorners, +/turf/open/floor/iron/white, +/area/station/medical/surgery) "xvu" = ( /obj/structure/table/reinforced, /obj/effect/spawner/random/trash/bacteria, @@ -87397,6 +87556,12 @@ }, /turf/open/floor/iron, /area/station/hallway/secondary/service) +"xwZ" = ( +/obj/structure/disposalpipe/segment{ + dir = 10 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/storage) "xxf" = ( /obj/effect/spawner/structure/window/reinforced, /turf/open/floor/plating, @@ -87752,6 +87917,12 @@ /obj/effect/turf_decal/sand/plating, /turf/open/floor/plating/rust/moonstation, /area/moonstation/surface) +"xAA" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/warning/vacuum/external/directional/south, +/obj/machinery/camera/autoname/engineering/directional/south, +/turf/open/floor/engine, +/area/station/engineering/supermatter/room) "xAB" = ( /obj/machinery/door/airlock/maintenance_hatch, /obj/effect/mapping_helpers/airlock/access/all/engineering/engine_equipment, @@ -87907,6 +88078,16 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/iron/dark, /area/station/security/checkpoint/science) +"xCn" = ( +/obj/machinery/firealarm/directional/north, +/obj/effect/turf_decal/trimline/yellow/filled/warning{ + dir = 4 + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 4 + }, +/turf/open/floor/iron/dark, +/area/station/cargo/sorting) "xCo" = ( /obj/structure/chair/stool/directional/north, /obj/effect/landmark/start/assistant, @@ -87945,10 +88126,6 @@ }, /turf/open/floor/iron, /area/station/cargo/miningdock) -"xDc" = ( -/obj/machinery/light/cold/directional/south, -/turf/open/floor/iron/dark/telecomms, -/area/station/science/server) "xDi" = ( /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -88109,15 +88286,6 @@ }, /turf/open/floor/iron/white/small, /area/station/common/pool) -"xEB" = ( -/obj/structure/railing, -/obj/effect/spawner/costume/cutewitch, -/obj/structure/rack, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/turf/open/floor/plating, -/area/station/maintenance/port) "xEN" = ( /obj/effect/turf_decal/siding/dark_green/corner{ dir = 1 @@ -88143,12 +88311,6 @@ /obj/item/pipe_dispenser, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"xFl" = ( -/obj/machinery/vending/tool, -/obj/machinery/firealarm/directional/west, -/obj/machinery/camera/autoname/engineering/directional/west, -/turf/open/floor/engine, -/area/station/engineering/storage_shared) "xFm" = ( /obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 8 @@ -88268,12 +88430,6 @@ /obj/machinery/holopad, /turf/open/floor/iron/dark, /area/station/service/chapel) -"xGK" = ( -/obj/structure/cable, -/obj/effect/turf_decal/siding/dark, -/obj/machinery/camera/autoname/prison/directional/east, -/turf/open/floor/iron/dark/small, -/area/station/security/corrections_officer) "xGN" = ( /obj/effect/turf_decal/siding/dark{ dir = 4 @@ -88341,16 +88497,6 @@ /obj/machinery/power/apc/auto_name/directional/south, /turf/open/floor/plating, /area/station/maintenance/abandon_cafeteria/hydro) -"xHU" = ( -/obj/machinery/power/apc/auto_name/directional/south, -/obj/structure/cable, -/obj/item/kirbyplants/random/fullysynthetic, -/obj/effect/turf_decal/stripes/red/line{ - dir = 1 - }, -/obj/effect/turf_decal/caution/stand_clear/red, -/turf/open/floor/iron/dark/small, -/area/station/ai/upload/chamber) "xHW" = ( /obj/structure/cable, /obj/effect/decal/cleanable/glass, @@ -88365,6 +88511,14 @@ /obj/machinery/space_heater, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) +"xIs" = ( +/obj/structure/cable, +/obj/machinery/power/terminal, +/obj/effect/turf_decal/stripes/line{ + dir = 10 + }, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "xIG" = ( /obj/machinery/skill_station, /turf/open/floor/iron/grimy, @@ -88391,12 +88545,6 @@ /obj/structure/stone_tile, /turf/open/misc/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) -"xJp" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/catwalk_floor, -/area/station/cargo/sorting) "xJs" = ( /obj/machinery/power/apc/auto_name/directional/north, /obj/structure/cable, @@ -88726,6 +88874,17 @@ /obj/effect/spawner/structure/window/reinforced/tinted, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"xNS" = ( +/obj/machinery/door/airlock/engineering/glass{ + name = "Supermatter Engine Room" + }, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/structure/cable, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/purple/hidden/layer5, +/turf/open/floor/plating, +/area/station/engineering/supermatter/room) "xNU" = ( /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -88859,6 +89018,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/catwalk_floor/iron_dark, /area/station/maintenance/department/engine/atmos) +"xPt" = ( +/obj/effect/turf_decal/siding/yellow{ + dir = 4 + }, +/obj/structure/disposalpipe/segment, +/obj/machinery/airalarm/directional/east, +/obj/machinery/camera/autoname/directional/east, +/turf/open/floor/iron/dark/herringbone, +/area/station/medical/morgue/office) "xPv" = ( /obj/effect/turf_decal/stripes/red/line, /obj/effect/turf_decal/caution/stand_clear/red, @@ -89426,12 +89594,6 @@ /obj/effect/decal/cleanable/dirt, /turf/open/floor/iron, /area/station/service/hydroponics) -"xWp" = ( -/obj/effect/mapping_helpers/broken_floor, -/obj/structure/cable, -/obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/plating, -/area/station/maintenance/department/engine/lower) "xWr" = ( /obj/effect/mapping_helpers/broken_floor, /obj/structure/cable, @@ -89535,20 +89697,6 @@ /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/station/ai/satellite/maintenance) -"xXt" = ( -/obj/effect/turf_decal/tile/neutral/half/contrasted{ - dir = 8 - }, -/obj/machinery/power/apc/auto_name/directional/west, -/obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment{ - dir = 6 - }, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron, -/area/station/terminal/lobby) "xXC" = ( /obj/effect/turf_decal/siding/purple{ dir = 8 @@ -89729,10 +89877,6 @@ }, /turf/open/floor/engine/vacuum, /area/station/science/ordnance/freezerchamber) -"xZQ" = ( -/obj/structure/hedge, -/turf/open/floor/iron/dark, -/area/station/engineering/break_room) "xZX" = ( /obj/effect/spawner/random/trash/bin, /obj/effect/turf_decal/stripes/corner{ @@ -90087,13 +90231,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/iron/dark/smooth_large, /area/station/security/prison) -"yep" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/cable, -/turf/open/floor/plating, -/area/station/maintenance/port) "yeu" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -90228,13 +90365,6 @@ /obj/machinery/disposal/bin, /turf/open/floor/iron/dark, /area/station/science/ordnance) -"yhg" = ( -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/machinery/firealarm/directional/east, -/obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/dark, -/area/station/command/eva) "yhC" = ( /obj/machinery/door/firedoor, /obj/effect/turf_decal/trimline/yellow/warning{ @@ -90374,19 +90504,6 @@ }, /turf/open/floor/iron/dark/corner, /area/station/hallway/secondary/exit/departure_lounge) -"yjw" = ( -/obj/effect/turf_decal/tile/holiday/rainbow/half/contrasted{ - dir = 8 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/structure/cable, -/obj/machinery/camera/autoname/directional/west, -/turf/open/floor/iron/dark/corner{ - dir = 1 - }, -/area/station/hallway/secondary/exit/departure_lounge) "yjW" = ( /obj/effect/turf_decal/tile/dark_blue/fourcorners, /obj/machinery/modular_computer/preset/engineering, @@ -90466,18 +90583,6 @@ }, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai/satellite/interior) -"ykN" = ( -/obj/effect/mapping_helpers/airlock/access/all/medical/surgery, -/obj/machinery/door/airlock/medical{ - name = "Operating Room" - }, -/obj/machinery/door/firedoor, -/obj/effect/landmark/navigate_destination/autoname, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/turf/open/floor/iron/white, -/area/station/medical/surgery) "ykY" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 @@ -90530,6 +90635,14 @@ dir = 1 }, /area/station/commons/public_dock) +"ylO" = ( +/obj/structure/cable, +/obj/machinery/door/airlock/engineering/glass, +/obj/effect/mapping_helpers/airlock/autoname, +/obj/effect/mapping_helpers/airlock/access/all/engineering/general, +/obj/effect/turf_decal/delivery, +/turf/open/floor/engine, +/area/station/engineering/engine_smes) "ylS" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -107681,8 +107794,8 @@ bkD duP duP rly -tjW -xlf +pPb +hPt rly oqB rpG @@ -109225,7 +109338,7 @@ oGF dSD osP itR -lVT +fQH uzc rpG rpG @@ -173217,8 +173330,8 @@ oGo lUL lUL ogU -lIg -dse +cmp +siE ogU mHl lUL @@ -174761,7 +174874,7 @@ sfS sfS sfS itR -rNm +ttZ lUL lUL lUL @@ -176567,7 +176680,7 @@ nLt tAJ gsc gpd -agp +oEM vAI vYx vYx @@ -186876,7 +186989,7 @@ oqb kjG kbd oqb -iKP +fnx rNs kJH kJH @@ -187354,7 +187467,7 @@ vYx kJH kJH vYM -bsp +hiu gEm afM euc @@ -187389,8 +187502,8 @@ kbd tUm mZi nLM -iPm -iKP +jcE +fnx rNs kJH kJH @@ -187611,7 +187724,7 @@ vYx kJH kJH vYM -cQM +tFO hiK afM euc @@ -187646,7 +187759,7 @@ nLM iRy sFt nLM -xWp +cwe fHn rNs kJH @@ -187903,8 +188016,8 @@ nLM sSA nLM nLM -jcE -hXy +uqY +quR rNs kJH vYx @@ -188160,7 +188273,7 @@ nLM nLM nLM sVr -oqb +fnx nLM rNs rNs @@ -188417,7 +188530,7 @@ fgP nLM ewt hJQ -jcE +uqY xPM tUm byp @@ -188674,7 +188787,7 @@ nLM nLM chF wKh -tUm +jXb nLM rNs rNs @@ -188924,14 +189037,14 @@ jnN jnN kJH rNs -sJW -dJW -jcE -jcE -cRv -qhx -iRy -dvc +rGv +tCH +uqY +uqY +oQX +cho +gFV +wcs fgP rNs vYx @@ -189181,8 +189294,8 @@ jnN jnN kJH rNs -jns -lBD +eNG +fvj iRy chF gLQ @@ -189438,8 +189551,8 @@ jnN jnN jnN rNs -pZJ -fgP +lGG +pjw rNs rNs rNs @@ -196344,8 +196457,8 @@ fGf rzx meD iTd -vjq -bQz +bGQ +hIR iTd aJt tGU @@ -197105,7 +197218,7 @@ vYx vMS mLz heh -cAT +cHr oDu fsV hPq @@ -198146,7 +198259,7 @@ cZh cZh uSn cKJ -uMz +tng aat cZh pxh @@ -198404,7 +198517,7 @@ nFN nFN nFN nFN -aOh +mvF nFN nFN nFN @@ -198903,10 +199016,10 @@ jCC jCC vYx fWv -xfP -gtK -kev -jVf +gKQ +kyh +kyh +kLE tgx sRJ sqL @@ -207897,7 +208010,7 @@ qth qth qth boa -vlv +oCp mHl hnw vYx @@ -211495,7 +211608,7 @@ kJH kJH hjh qNb -gCK +vVf egf gwQ egf @@ -222794,7 +222907,7 @@ xOb dwY lsw tHD -sum +rxj xxf ycN bxA @@ -223033,7 +223146,7 @@ mqh xfC wtC uTH -xXt +oJt bEO ehw idX @@ -225594,7 +225707,7 @@ oNi pgG pgG pgG -oYW +czQ cOG sOy idX @@ -225605,7 +225718,7 @@ idX idX lLr cOG -wTa +uNl ooF ocT dmG @@ -226634,13 +226747,13 @@ pWN pWN pWN lnY -toF +wsd pNG byn jcV agK pNG -agV +juE lnY oYE eQn @@ -236914,13 +237027,13 @@ vvX eYR eYR lLk -hWo +exZ pNG byn vbp agK pNG -iAr +sSR lLk eYR eYR @@ -236960,7 +237073,7 @@ hGg dQM scw ujM -wLO +dbC kGS kSL sQh @@ -238705,7 +238818,7 @@ nuL nuL nuL tnw -adT +uYT eYx mDc nAJ @@ -238753,8 +238866,8 @@ fTQ nim tCA sfN -lIg -fAe +cmp +ujo ogU flE wBG @@ -240021,7 +240134,7 @@ ijM lbf iFm knt -eKq +gpH oSK hFm oEe @@ -240297,7 +240410,7 @@ sfS sfS sfS itR -qpx +mps wBG ujL wBG @@ -243084,7 +243197,7 @@ jdy dVv xye oDx -xdW +pyE awM awM awM @@ -243660,8 +243773,8 @@ ryk ryk bri epx -uOU -srt +cJn +fJx fAd fUQ eIb @@ -243917,8 +244030,8 @@ bjf bjf kYn aOl -jET -rMf +pDr +xwZ cdp rSo eIb @@ -244168,7 +244281,7 @@ wDe jZx vUM mQt -xuc +msI qRH jAO jAO @@ -244455,7 +244568,7 @@ nsw fLq hhR wWs -qBf +toH rdH rdH rdH @@ -244931,10 +245044,10 @@ qqt ixz tNi mXD -hRK -gQZ -rHy -jcG +cFT +wUD +vyC +hvy bbu qDr cvK @@ -245187,11 +245300,11 @@ iwv gDc jpJ qjD -lRX -xJp +wKl +mtK pMG nNl -kiY +nym qPv jEs tbD @@ -245432,8 +245545,8 @@ wxU dBe ckk vSC -xEB -jPr +fDi +tAw trl gjs ckk @@ -245444,11 +245557,11 @@ eHP rpq rpq gUD -puH -avS -eBb -npq -dlI +gEo +lnw +pMG +kgj +ahk qPv iBa xox @@ -245689,12 +245802,12 @@ nKY ckk ckk nWw -oAW -lpU -ozm -ozm +plj +lGP +grO +iGQ amH -ulD +qVt lBq qqt qIb @@ -245702,7 +245815,7 @@ qIb svZ qqt mXD -xJp +fIj lSO pVY ocg @@ -245947,9 +246060,9 @@ ckk tCA vzd trl -tAw -lNI -dpZ +trl +sEz +phg ckk ckk xzt @@ -245957,9 +246070,9 @@ qqt qIb qqt dlQ -mIS +qli mXD -bAy +xCn gDI wkO mhi @@ -245971,7 +246084,7 @@ gDI fnD umC umC -nrg +kif wXW bbn wRx @@ -246204,10 +246317,10 @@ rfW cCH iGQ iGQ -jyB -tYn -tXC -eIq +oUI +dCG +sPn +sPn ckk ckk ckk @@ -246216,7 +246329,7 @@ ckk ckk ckk ckk -iFd +gGG ckk srR kxh @@ -246464,16 +246577,16 @@ bXl bXl bXl bXl -qiX -yep -yep -yep -yep -yep -yep -yep -yep -fXX +sPn +sPn +sPn +sPn +sPn +sPn +sPn +sPn +sPn +sNU ckk qTE loB @@ -246671,7 +246784,7 @@ ryp eTL rQX xkB -yhg +hYA kon ekY kon @@ -246761,7 +246874,7 @@ pQk tWT pvv hPo -oaU +roH hPo gDT qQe @@ -246774,13 +246887,13 @@ qSN gKn qDO jMW -pId -vCw -phh -phh -hNg -phh -phh +lCN +fuz +iay +iay +hLe +iay +iay jfS apZ jch @@ -246991,7 +247104,7 @@ sPn sPn qjT jmt -oyJ +qAq epR hzI oVZ @@ -247031,13 +247144,13 @@ wPp tXd rdH nMo -tOR +mDO rdH rdH kAk rdH rdH -phh +iay pwH uVn mhy @@ -247214,7 +247327,7 @@ cAq cAq fQB fQB -lab +gEq mfS mfS cTY @@ -247235,7 +247348,7 @@ jQN bBY svc jQN -bXH +lYD cif ghA oDv @@ -247288,13 +247401,13 @@ kyH gcM rdH rdH -tOR +mDO rdH xci hwn hiB rdH -phh +iay eZW lxU mhy @@ -247485,7 +247598,7 @@ gzf jpU kUn oIt -nFk +dEQ trd jxN jQN @@ -247513,7 +247626,7 @@ mmS mMP mMP lNW -jHv +ipv nvT chJ oea @@ -247528,7 +247641,7 @@ rdH qrm ndp itb -rrc +sms iAL wIn hEm @@ -247544,14 +247657,14 @@ evn xaW pFE rdH -wPx -tOR +jYT +mDO rdH aBH jfS fnP rdH -phh +iay lkN lxU mhy @@ -247780,7 +247893,7 @@ hLJ eBn hTi lKs -mOJ +kPs rdH xoe clb @@ -247801,14 +247914,14 @@ ydN riC lgz xNG -rRH -tOR +kpU +mDO itb itb itb itb itb -jLC +uXv itb itb jqG @@ -248058,14 +248171,14 @@ uMn kuz pyn rdH -jCJ -tOR +tNV +mDO itb qmv uSM oHf itb -gNU +mgA itb rBK rBK @@ -248321,9 +248434,9 @@ itb sWu sWu sWu -fqv -gOA -txl +iEG +weg +lDY sWu sWu sWu @@ -248572,23 +248685,23 @@ tKX deg jDI pQs -eOF +hxc iwJ ujG uoK tJx -iMH -uKe +qUh +qUh kxC -muq -muq -muq -muq -muq -muq -muq -dMy -jXm +qUh +qUh +qUh +qUh +qUh +qUh +qUh +whV +acm xxk tlq wYP @@ -248790,7 +248903,7 @@ nol bXl sSE ckk -lAD +lbU bcD oea oea @@ -248823,7 +248936,7 @@ sMI jmo ygg onm -pwG +tBP lQf onm jFa @@ -248834,17 +248947,17 @@ dje ify wtd rWi -gDg rWi -bQG -bQG -bQG -bQG -bQG +rWi +nur +nur +nur +nur +nur +nur +nur +nur nur -bQG -bQG -bQG nur nPc wVC @@ -249064,7 +249177,7 @@ rdH eDQ jfS xAd -lxU +ujT lxU jfS gOK @@ -249091,7 +249204,7 @@ tiB ujG xFg wtd -fmB +wtd wtd wtd wtd @@ -249321,15 +249434,15 @@ rdH fuR lxU rdH +iZb +rdH +rdH rdH -uVn -iNE -uVn itb nQK hLj gWY -kbe +lsX diP amq rXq @@ -249348,7 +249461,7 @@ ioc tlq fTg wtd -fmB +wtd lYW nFX fxU @@ -249578,9 +249691,9 @@ rdH eDQ uVn rdH -nWj +xoR xjL -kFe +wPx mif itb lNl @@ -249605,7 +249718,7 @@ lrp qNq ePl wtd -fmB +wtd tiO dNU uHs @@ -249862,7 +249975,7 @@ ioc lnx wtd wtd -fmB +wtd xNF hBt uHs @@ -250119,7 +250232,7 @@ bMb ujG qDR wtd -fmB +wtd wtd uHs uHs @@ -250376,7 +250489,7 @@ qAQ uSo uSo xLD -fmB +wtd wtd dig fWW @@ -250533,7 +250646,7 @@ eDm xEk dSS uEa -gfA +rws aEs eIp uQk @@ -250633,7 +250746,7 @@ dvy uyP kZr wtd -fmB +wtd sei vuw foh @@ -250859,7 +250972,7 @@ bSf xzL qri rIk -xFl +vpi moq izP lFk @@ -250890,7 +251003,7 @@ dvy uyP kZr wtd -nmH +wLG sei uHs uqI @@ -251037,7 +251150,7 @@ fBj wUf yaF tRu -cYr +xrP cxj vef oXS @@ -251074,7 +251187,7 @@ shJ lFR iAQ doM -gCY +sPa tEm cay cay @@ -251147,7 +251260,7 @@ dvy uyP kZr wtd -lpS +sei sei vuw foh @@ -251274,7 +251387,7 @@ lvc dTi lvc lvc -mBN +xjG syq lHy lHy @@ -251331,12 +251444,12 @@ lKb fyZ mpC doM -pUL +vTL kGx tUf qmz fVE -ilz +qnH bJH uiV kiH @@ -251404,7 +251517,7 @@ fnu uSo qaW qQW -lpS +sei wtd dig pSI @@ -251531,7 +251644,7 @@ bVk eCs xPv lnC -xHU +ljj syq mAM vNa @@ -251661,7 +251774,7 @@ oBO ujG qDR wtd -lpS +sei wtd uHs uHs @@ -251905,7 +252018,7 @@ rqG pag tPl fjw -fdv +grz grz grz grz @@ -251918,7 +252031,7 @@ ioc sZP wtd wtd -lpS +sei lYW nkI uHs @@ -252045,7 +252158,7 @@ nci vRA xPv lnC -uNY +wHP syq mAM gLy @@ -252090,7 +252203,7 @@ gzT xXG eGJ rLP -wmh +jqs hba bdi uiV @@ -252162,7 +252275,7 @@ rzQ nra snQ wHe -tEU +npK cSx xnK mtB @@ -252175,7 +252288,7 @@ lrp ujG lHU wtd -lpS +sei kAA jWl uHs @@ -252302,7 +252415,7 @@ sql jvu sql sql -sdz +tId syq lHy lHy @@ -252340,7 +252453,7 @@ vgd elI des uVN -cxw +iXY xXG sYf oDi @@ -252388,7 +252501,7 @@ sLp tKS leq dMa -cfs +bKu lgy lgy dRP @@ -252419,7 +252532,7 @@ oLm nra snQ cDg -tEU +npK kYg ogP kYg @@ -252432,7 +252545,7 @@ ioc tlq lHU wtd -lpS +sei mcd nFX bCF @@ -252443,7 +252556,7 @@ qUh wtd sei gWw -nXj +xAA ujG wVC wVC @@ -252579,7 +252692,7 @@ fBj wUf tXV tRu -lEm +jwn pXI jsG sQz @@ -252662,34 +252775,34 @@ sZO qUa bTq kFb -sKX -jFX -cSb -cSb -hIh +rSf +hQi +vQJ +vQJ +uix wBj gfE hUz tEU -oQV +nof oLm nra snQ miS -tXq +dwd oXq xkn sEn -rMJ +azq sEn -hno -bpa -kUw -kXv +oOb +bZD +bth +mFY ujG yaL wtd -lpS +sei byr cQf cQf @@ -252894,7 +253007,7 @@ fSG bex bHq euc -igY +azd xAV igt xAV @@ -252921,32 +253034,32 @@ naS xCq rSG xCq -bEs -sFm -xZQ +fkt +edg +lWG fvC gua bKL -xlo +kKN pQr dFU ycG jiF iIt -tEU +npK iBf lrQ sSt npK vkY -txL +glb eLh vkY -liu -jhC -taV -oUF -pmn +mqu +xNS +sYa +wNO +crc uGG cQf wtd @@ -253103,7 +253216,7 @@ prg jff qlD iDQ -uCa +aMy qAZ iDt jGu @@ -253190,15 +253303,15 @@ poT eqH ktG mXF -tEU +npK rQF nMr lHg npK -pYj -pax -dDO -wau +ayr +cih +oyI +sxu tHL ujG mAc @@ -253386,7 +253499,7 @@ rCJ rCJ hZw gHA -rPz +akd wSG lkv lkv @@ -253408,7 +253521,7 @@ bDm dQY dae lpY -nOo +fOE xAV jTr xAV @@ -253453,10 +253566,10 @@ fNS vih wyd cEO -dXU +ylO cEO vih -rVU +pbf vih afF xkb @@ -253706,12 +253819,12 @@ lmC tVi vih rKx -aPK +eIR vih -mAy -vKC -qGx -uQo +sxD +uWZ +xIs +eje vih pqw vih @@ -253965,10 +254078,10 @@ vih tAr eIR vih -jpe -qFS -ebL -hoY +bPW +aoz +sTM +bYM vih jyX vih @@ -254196,7 +254309,7 @@ vOk fab ljk uqk -pJB +byx kbA mIV uqk @@ -254217,17 +254330,17 @@ inX mvs qdJ xwf -hzx +rQe vih tAr -eIR +imX vih -pTi -unz -rKh -wkz +wRY +tDV +aIf +cWG vih -qEv +jDb vih hli hZW @@ -254466,7 +254579,7 @@ xCq qQU sqs fvF -nPH +qaT pUe nAF oOJ @@ -254479,10 +254592,10 @@ xAB caS gQF tKU -bIn -rkW -rnD -pFh +cwq +rUy +kUD +wpB vih hWl wAO @@ -254707,8 +254820,8 @@ iWb lEP mMg lfD -jpT -lNF +fXs +uSe uqk gqa rhu @@ -254736,10 +254849,10 @@ vih aQr bxT vih -jqH -rPa -vJD -fRt +rrL +uRU +bDA +hGw vih pSH vih @@ -254964,8 +255077,8 @@ opZ gHe mMg xkg -obv -tUL +mNv +hRA xzB rhr vvY @@ -254974,7 +255087,7 @@ oJm sAC btC xCq -tCP +iOK mmU jeX jeX @@ -255220,7 +255333,7 @@ jis eko fFC mMg -uYI +ahI fXs gnt uqk @@ -255244,7 +255357,7 @@ eMz eMz eMz kMq -nFp +sdx wcX tLe ozl @@ -255388,7 +255501,7 @@ wjy mfn pCF bok -xGK +dqz aaY nkw mlc @@ -255672,7 +255785,7 @@ suj rCv flO bsQ -unO +jVe rFk oSL deG @@ -255921,7 +256034,7 @@ agR nAT nAT uJW -gPz +hzD cNw dyk rxw @@ -256410,7 +256523,7 @@ qzH qzH qzH qzH -sso +gbq gcp rHf jSp @@ -256458,7 +256571,7 @@ wEJ cHh bga aZY -bQv +jYv jnK rpt rpt @@ -256479,9 +256592,9 @@ hfe frd frd xgq -oeJ -oeJ -oeJ +vMs +vMs +vMs xAV xAV xAV @@ -256492,7 +256605,7 @@ qyL smN jTr xAV -xAV +joI sSh xAV ubz @@ -256734,9 +256847,9 @@ dac dac oMZ xIY -hGr +vMv xgq -aFS +bix hje wXK ldB @@ -256985,14 +257098,14 @@ lxZ sbo xUZ hfe -cAV -nFM -kpS -iXx +mac +wPB +aGl +ocO rXa mje ere -oeJ +iIM ouD obx rBY @@ -257248,7 +257361,7 @@ oKj gMx aCv vkg -bxp +pSO xgq nvM qcj @@ -257297,7 +257410,7 @@ lvj xhx kpc lDk -gxa +xpS xCq eMz eMz @@ -257506,7 +257619,7 @@ gMx lpj hvl skt -oeJ +iIM mKH chM xNk @@ -257521,7 +257634,7 @@ rjx utg eTw tQV -qhZ +nIC pYi xAV xAV @@ -257538,7 +257651,7 @@ eXt uSe hIF ust -wDg +shh wCc qcQ nac @@ -257691,7 +257804,7 @@ twO pmm lgH cio -sDg +bKZ fsA sgl smH @@ -257761,7 +257874,7 @@ cAp oKj gMx qeA -rdi +iyZ lqp xgq ftV @@ -258011,9 +258124,9 @@ ukP wUZ vWS gzH -jiA +xUZ hfe -ofS +kVy cAp oKj knV @@ -258022,7 +258135,7 @@ vos ohj xgq xgq -cyf +nPJ xgq mmQ nxa @@ -258270,11 +258383,11 @@ fet gzH xUZ hfe -oKG -fvn -iFo -iTR -dKc +aZy +etQ +jkP +fWH +hof vos cis ugF @@ -258284,10 +258397,10 @@ hSm mmQ mmQ pOz -ykN +nib mmQ mmQ -wxH +xvt pOz mmQ eTw @@ -258526,19 +258639,19 @@ rpt ske gzH xUZ -wFT +oCX vkg ycU kIX rdh -pAr -kqf +qln +rAR udc jtD jtD jtD hci -vfE +nYE pLv jtD kVC @@ -258783,12 +258896,12 @@ aOE vWS gzH xUZ -wFT +mxs vkg god mUk phq -cAp +snk sHH cLN qce @@ -259040,17 +259153,17 @@ rfY vWS gzH ugc -wIP +rgw jMk chl phq pEY -cnT -nYT +ouV +hmP oRp lnj eDj -eDj +rpc eDj fcw eDj @@ -259319,7 +259432,7 @@ jXJ dHp qKF hix -nro +jQH iPZ sYQ xDo @@ -259553,7 +259666,7 @@ bSs vws vWS gzH -nZf +aWj cUf qhh kJS @@ -259744,7 +259857,7 @@ pmb vcG pmb bcK -sus +ePU qiD tXD gaJ @@ -259818,7 +259931,7 @@ nrO lvq eZC daw -eMD +bJc cUf bTp xNj @@ -260370,7 +260483,7 @@ wSb eAg hqr hqr -wOh +wpb fqD feF feF @@ -260591,7 +260704,7 @@ jRU whT rlw jXZ -niQ +cxU jFm iRW vNF @@ -260840,7 +260953,7 @@ dKr sbo nKN cUf -gUK +giP eqL oXp ene @@ -260848,7 +260961,7 @@ hxQ tdk bRH nPa -tMQ +oqr jFm iRW hsG @@ -261169,7 +261282,7 @@ cfZ uDt aaZ lTM -coB +tsV tTj bup xmZ @@ -261352,7 +261465,7 @@ aSD bSs riL sbo -bJT +uIa cUf tAn pYl @@ -261426,7 +261539,7 @@ lTM qbb hEZ lTM -hUK +fsa qIj gqG vUw @@ -261650,7 +261763,7 @@ beP gHW eWg dQz -phU +fOR eUQ dEY eWg @@ -261861,7 +261974,7 @@ rcN aSD bSs aIo -iWg +cKs bSs bSs cse @@ -261882,7 +261995,7 @@ ftj qNp qNp xNX -feK +iSP xNX qNp qNp @@ -262118,7 +262231,7 @@ eJj bSs bSs bSs -ask +juv bSs seb lxZ @@ -262152,7 +262265,7 @@ tQA vJb sBa sBa -soO +cMT tvG gLb cgU @@ -262398,7 +262511,7 @@ wid pVV vVW cTp -lOP +mkx qwt gMQ hSn @@ -263418,7 +263531,7 @@ mBU fQd qNH jvA -hAq +miT emh jVH ogo @@ -263444,7 +263557,7 @@ uYd big okL lSy -iEK +sXt beP fww jvi @@ -263683,7 +263796,7 @@ lbw txR elY cET -utm +gjj xMF qal mKr @@ -263940,7 +264053,7 @@ wDZ txR ant qKk -hJy +mqg uQF vlE wUb @@ -263954,7 +264067,7 @@ heY heY heY npG -ebs +tfW nhO fYp lSy @@ -264439,14 +264552,14 @@ gzH lNN lzw lzw -mLq +kIV lNY dWl mLX lzw cjp obs -eKA +xPt kzH nnt ogo @@ -264738,7 +264851,7 @@ cKG wsh qFK psw -jsu +caA unD bGR cKG @@ -264958,7 +265071,7 @@ jlO jBk xaX vXF -jCH +ufx xaX xaX kKk @@ -264989,7 +265102,7 @@ lSM ejo pvF hEh -uuA +czj cKG cmj mIK @@ -265252,7 +265365,7 @@ vFQ dRx gJY wsh -nOs +sCK nOs iGh cKG @@ -266225,8 +266338,8 @@ lIk wbB nXy aSD -eFI -nZK +vwn +wyI nZK nZK beH @@ -266278,9 +266391,9 @@ xFm rJY nfZ cEC -iyh +jgi cLA -meI +sMu jsu iKB caA @@ -266310,8 +266423,8 @@ dST gZS dST owD -pcT -iNM +gHB +nKG vWI xYR nWn @@ -266479,11 +266592,11 @@ dmv tIT llX vJe -wbB +tIT nXy nXy -mJc -bhF +aSD +snH jkc aSD bSs @@ -266537,7 +266650,7 @@ bwe jMS eAu cKG -rDU +bOJ eZw cKG oql @@ -266811,7 +266924,7 @@ nly gKw adt vWI -pcT +gHB pcT owD dST @@ -267050,9 +267163,9 @@ pqE kHv prw tFV -biu +ada ceq -epE +nns tFV bKy wIB @@ -267307,12 +267420,12 @@ eSv cHG mSQ tFV -hCm +pNg ceq -hRS -txU -uIm -xDc +lBc +bYI +uLT +vGf tFV xFu fzh @@ -267537,7 +267650,7 @@ pqO ucI pes ekk -arz +pHV uxw pqO kuZ @@ -267564,9 +267677,9 @@ tke tke tke tFV -hhw +fAy ceq -tyw +wLE tFV mQU vRp @@ -268056,7 +268169,7 @@ pqO pqO pBb qHf -srm +ezp xzG syf syf @@ -268545,7 +268658,7 @@ bji lNE iRZ lPQ -kjL +bCC lXx cZk gXX @@ -268839,7 +268952,7 @@ wAv svI aZT iBD -cov +uYj kCF lBf jKZ @@ -269096,7 +269209,7 @@ sWm onn sWm iBD -uXd +dZv dZs ehe qfZ @@ -269572,7 +269685,7 @@ pJr pgw yiD hBc -jJH +sya qhv cDi pCr @@ -269871,7 +269984,7 @@ sHK rZN rLm pxG -hfH +oln wUI qSU iBD @@ -270875,7 +270988,7 @@ nZd pqO rnW pqO -uMI +qdg fGt fks bjh @@ -271121,7 +271234,7 @@ lgP erE rWo pqO -oxc +pEg plH pqO pqO @@ -271414,8 +271527,8 @@ jQe cJF vik kOd -lGH -mUA +crW +qGi dHE olL xXC @@ -271672,7 +271785,7 @@ vcA xsY jrX jYl -ppr +eWn dHE inW iTr @@ -271920,7 +272033,7 @@ mJY xeQ tSK uWe -mCr +otB ioo dHE mEO @@ -271929,7 +272042,7 @@ gHa vTF gHa wlI -pMA +fwA dHE wDl gKi @@ -272185,8 +272298,8 @@ tOS xDT anA jOa -pPT -fhi +uKK +vTe dHE swB nji @@ -272431,10 +272544,10 @@ ydU qSI rxy rxy -odV +atZ wMo -kEr -kEr +ewd +ewd kEr pPr guQ @@ -272692,7 +272805,7 @@ aux uJk xpi xKq -uTk +lMh cxI rDN dGx @@ -272951,9 +273064,9 @@ rIS tSk vfx pPr -aTP -gLz -wJV +oVW +emB +spZ dHE bUt klX @@ -273964,7 +274077,7 @@ kxF kxF ipO wOB -yjw +ajR qgk reX sVl @@ -274997,8 +275110,8 @@ wYK sVl sVl bcY -tkk -oCn +xpJ +ntm uup kqT kHR @@ -275261,7 +275374,7 @@ pKP pKP nrk twJ -iDF +nIz haO pPr wAj @@ -275274,7 +275387,7 @@ eSL tuV qyH jME -unb +mzv iPM liL aZz @@ -275769,7 +275882,7 @@ bWv bWv jsW vQH -dGO +diz pKP pKP pKP @@ -276026,11 +276139,11 @@ sVl sVl loj vQH -mMX +tSa pKP qos pKP -xhk +gnB uJk rIS iDF @@ -276805,7 +276918,7 @@ pKP uJk hJh qAK -xGO +tSk uqe nCh xih @@ -276816,7 +276929,7 @@ rIS pPr ngZ dny -kBR +mib emJ eYe pPr @@ -277048,7 +277161,7 @@ bed yjq yjq kYN -viG +bQa qbS ieC pMK diff --git a/_maps/skyrat/holodeck_wargame.dmm b/_maps/skyrat/holodeck_wargame.dmm index bfdb99aace5..6a52acab852 100644 --- a/_maps/skyrat/holodeck_wargame.dmm +++ b/_maps/skyrat/holodeck_wargame.dmm @@ -102,8 +102,8 @@ "t" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red, /obj/item/clothing/head/soft/red, +/obj/item/clothing/under/color/red, /turf/open/floor/holofloor/wood, /area/template_noop) "w" = ( @@ -172,8 +172,8 @@ dir = 6 }, /obj/structure/closet/cabinet, -/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants, /obj/item/clothing/head/soft/grey, +/obj/item/clothing/under/color/grey, /turf/open/floor/holofloor/wood, /area/template_noop) "J" = ( diff --git a/code/__DEFINES/~~bubber_defines/colors.dm b/code/__DEFINES/~~bubber_defines/colors.dm index 6a1b181357f..34616b45fe8 100644 --- a/code/__DEFINES/~~bubber_defines/colors.dm +++ b/code/__DEFINES/~~bubber_defines/colors.dm @@ -10,7 +10,8 @@ GLOBAL_LIST_INIT(chat_colors_by_mob_name, list( )) /// Blood colors -#define BLOOD_COLOR_COPPER "#6E3B08" +//teal oxidized skrell blood - slightly brightened copper oxide hue +#define BLOOD_COLOR_COPPER "#70B596" #define BLOOD_COLOR_NANITE_SLURRY "#CCCCCC" //alternate lizard blood #define BLOOD_COLOR_GREEN "#339933" diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index b4787133616..b6f1423d06c 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -79,12 +79,10 @@ new /obj/item/clothing/neck/tie/bunnytie/hop(src) new /obj/item/clothing/head/hopcap/beret(src) new /obj/item/clothing/head/hopcap/beret/alt(src) - new /obj/item/clothing/head/hats/imperial/hop(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck/skirt(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade(src) new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade/female(src) - new /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial(src) new /obj/item/clothing/suit/armor/vest/hop/hop_formal(src) new /obj/item/clothing/neck/mantle/hopmantle(src) @@ -128,9 +126,7 @@ new /obj/item/clothing/under/rank/security/head_of_security/bunnysuit(src) new /obj/item/clothing/suit/armor/hos_tailcoat(src) new /obj/item/clothing/head/hats/hos/beret/navyhos(src) - new /obj/item/clothing/head/hats/imperial/hos(src) new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper(src) - new /obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial(src) new /obj/item/clothing/suit/jacket/hos/blue(src) new /obj/item/clothing/neck/mantle/hosmantle(src) @@ -165,7 +161,6 @@ new /obj/item/clothing/head/beret/science/rd/alt(src) new /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit(src) new /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit/skirt(src) - new /obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial(src) new /obj/item/clothing/neck/mantle/rdmantle(src) new /obj/item/clothing/suit/toggle/labcoat(src) new /obj/item/clothing/suit/toggle/labcoat/research_director(src) @@ -194,8 +189,6 @@ new /obj/item/storage/backpack/messenger/chief_medic(src) //Duplication from Commdrobe new /obj/item/clothing/head/beret/medical/cmo/alt(src) - new /obj/item/clothing/head/hats/imperial/cmo(src) - new /obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial(src) new /obj/item/clothing/neck/mantle/cmomantle(src) new /obj/item/clothing/head/playbunnyears/cmo(src) new /obj/item/clothing/under/rank/medical/cmo_bunnysuit(src) @@ -216,8 +209,6 @@ new /obj/item/clothing/shoes/sneakers/brown(src) //Duplication from Commdrobe new /obj/item/clothing/head/beret/engi/ce(src) - new /obj/item/clothing/head/hats/imperial/ce(src) - new /obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial(src) new /obj/item/clothing/neck/mantle/cemantle(src) new /obj/item/clothing/head/playbunnyears/ce(src) new /obj/item/clothing/under/rank/engineering/chief_engineer/bunnysuit(src) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 64743f6b416..bfe10fd1514 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -250,6 +250,21 @@ GLOBAL_LIST_EMPTY(preferences_datums) if ("remove_current_slot") remove_current_slot() return TRUE + if ("duplicate_current_slot") //BUBBER ADDITION START - Character duplication + save_character() + if(sanitize_languages()) + save_character() + var/list/character_list = create_character_profiles() + var/list/slot_choices = list() + for(var/i = 1, i <= character_list.len, i++) + slot_choices += "Slot [i]: [character_list[i]]" + var/target_slot = tgui_input_list(ui.user, "Pick a slot to copy to.", "Duplicate Character", slot_choices, null) + if(!isnull(target_slot)) + duplicate_current_slot(slot_choices.Find(target_slot)) + tainted_character_profiles = TRUE + else + tgui_alert(ui.user, "Cancelled Duplication", "Duplicate Character") + return TRUE //BUBBER ADDITION END - Character duplication if ("rotate") /* SKYRAT EDIT - Bi-directional prefs menu rotation - ORIGINAL: character_preview_view.dir = turn(character_preview_view.dir, -90) diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index 5c34e218385..0715c129d84 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -389,14 +389,20 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car return needs_update != -3 // BUBBER EDIT -/datum/preferences/proc/save_character(update) // Skyrat edit - Choose when to update (This is stupid) +/datum/preferences/proc/save_character(update, override_slot) // Skyrat edit - Choose when to update (This is stupid) //Bubber Edit - duplication support SHOULD_NOT_SLEEP(TRUE) if(!path) return FALSE var/tree_key = "character[default_slot]" if(!(tree_key in savefile.get_entry())) savefile.set_entry(tree_key, list()) - var/save_data = savefile.get_entry(tree_key) + var/save_data //BUBBER EDIT START - Original var/save_data = savefile.get_entry(tree_key) + if(!isnull(override_slot)) + var/override_tree_key = "character[override_slot]" + savefile.set_entry(override_tree_key, list()) + save_data = savefile.get_entry(override_tree_key) + else + save_data = savefile.get_entry(tree_key) //BUBBER EDIT END for (var/datum/preference/preference as anything in get_preferences_in_priority_order()) if (preference.savefile_identifier != PREFERENCE_CHARACTER) @@ -408,7 +414,10 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car recently_updated_keys -= preference.type if (preference.type in value_cache) - write_preference(preference, preference.serialize(value_cache[preference.type])) + if(!isnull(override_slot)) //BUBBER EDIT ADDITION START - Original: write_preference(preference, preference.serialize(value_cache[preference.type])) + write_preference_special(preference, preference.serialize(value_cache[preference.type]), override_slot) + else + write_preference(preference, preference.serialize(value_cache[preference.type])) //BUBBER EDIT ADDITION END save_data["version"] = SAVEFILE_VERSION_MAX //load_character will sanitize any bad data, so assume up-to-date. @@ -467,6 +476,20 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car tainted_character_profiles = TRUE switch_to_slot(closest_slot) +/datum/preferences/proc/duplicate_current_slot(target_slot) + PRIVATE_PROC(TRUE) + if(isnull(target_slot)) + return + save_character(TRUE, target_slot) + +/datum/preferences/proc/write_preference_special(datum/preference/preference, preference_value, override_slot) + var/save_data = savefile.get_entry("character[override_slot]") + var/new_value = preference.deserialize(preference_value, src) + var/success = preference.write(save_data, new_value) + if (success) + value_cache[preference.type] = new_value + return success + /datum/preferences/proc/sanitize_be_special(list/input_be_special) var/list/output = list() diff --git a/code/modules/mob/living/silicon/robot/emote.dm b/code/modules/mob/living/silicon/robot/emote.dm index f304cbbc400..99739279d85 100644 --- a/code/modules/mob/living/silicon/robot/emote.dm +++ b/code/modules/mob/living/silicon/robot/emote.dm @@ -63,9 +63,3 @@ message = "blares an alarm!" emote_type = EMOTE_AUDIBLE sound = 'sound/machines/warning-buzzer.ogg' - -/datum/emote/silicon/slowclap - key = "slowclap" - message = "activates their slow clap processor." - emote_type = EMOTE_AUDIBLE - sound = 'sound/machines/slowclap.ogg' diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm index 5571ec747ba..8ac7383b69b 100644 --- a/code/modules/research/designs/weapon_designs.dm +++ b/code/modules/research/designs/weapon_designs.dm @@ -216,7 +216,7 @@ departmental_flags = DEPARTMENT_BITFLAG_SECURITY /datum/design/c38_flare_mag - name = "Magazine (.38 Flae) (VERY Lethal)" + name = "Magazine (.38 Flare) (VERY Lethal)" desc = "Designed to tactically reload a NT BR-38 Battle Rifle. Flare casings launch a concentrated particle beam towards a target, lighting them up for everyone to see." id = "c38_flare_mag" build_type = PROTOLATHE | AWAY_LATHE diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index 9482f8396c0..82e2d7b8fcd 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -308,10 +308,6 @@ GLOBAL_LIST_INIT(autodrobe_contraband_items, list( /obj/item/skillchip/musical = 3, /obj/item/storage/box/tape_wizard = 1, // BUBBER EDIT ADDITION BEGIN - Extra stuff - /obj/item/clothing/head/hats/imperial = 5, - /obj/item/clothing/head/hats/imperial/grey = 5, - /obj/item/clothing/head/hats/imperial/helmet = 5, - /obj/item/clothing/head/hats/imperial/red = 5, /obj/item/clothing/head/playbunnyears/syndicate/fake = 3, /obj/item/clothing/mask/balaclava/threehole = 5, /obj/item/clothing/mask/balaclava/threehole/green = 5, @@ -325,10 +321,6 @@ GLOBAL_LIST_INIT(autodrobe_contraband_items, list( /obj/item/clothing/suit/jacket/tailcoat/syndicate/fake = 3, /obj/item/clothing/suit/scraparmour = 3, /obj/item/clothing/suit/toggle/jacket/zubber/bomber/syndicate/fake = 3, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red = 5, /obj/item/clothing/under/rank/security/detective/cowboy/armorless = 3, /obj/item/clothing/under/syndicate/skyrat/enclave = 3, /obj/item/clothing/under/syndicate/skyrat/enclave/officer = 3, diff --git a/config/maps.txt b/config/maps.txt index f08e9ee0ba9..4facae2553f 100644 --- a/config/maps.txt +++ b/config/maps.txt @@ -18,74 +18,68 @@ endmap # Production-level maps. map deltastation - minplayers 50 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/deltastation/ endmap map icebox - minplayers 25 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/icebox/ endmap map catwalkstation - minplayers 25 # votable endmap map metastation - minplayers 25 - #voteweight 0.5 votable - #feedbacklink https://www.youtube.com/watch?v=XG8b7WhANNA - #webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/metastation + webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/metastation/ endmap map tramstation - minplayers 35 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/tramstation/ endmap map nebulastation - minplayers 35 votable endmap -#map wawastation -# votable -# minplayers 40 -#endmap +map wawastation + votable + webmap_url https://webmap.affectedarc07.co.uk/maps/tgstation/wawastation/ +endmap # Bubberstation maps. map biodome - minplayers 40 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/bubber/biodome/ endmap map blueshift - minplayers 65 - feedbacklink https://discord.com/channels/1059199070016655462/1376747654339624970 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/bubber/blueshift/ endmap map boxstation - minplayers 30 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/bubber/boxstation/ endmap map kilostation - maxplayers 40 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/bubber/kilostation/ endmap map moonstation - minplayers 50 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/bubber/moonstation/ endmap map voidraptor - minplayers 40 votable + webmap_url https://webmap.affectedarc07.co.uk/maps/bubber/voidraptor/ endmap # Debug-only maps. @@ -98,3 +92,6 @@ endmap map runtimestation endmap + +map eventmap +endmap diff --git a/html/changelogs/bubber_archive/2025-12.yml b/html/changelogs/bubber_archive/2025-12.yml new file mode 100644 index 00000000000..44462fd12a0 --- /dev/null +++ b/html/changelogs/bubber_archive/2025-12.yml @@ -0,0 +1,76 @@ +2025-12-01: + IronDragoon: + - rscadd: new reagent, 'Juice That Makes You Weh'. It makes you weh. Cannot currently + be synthesized + - rscadd: new maints item, 'Weh-nade', contains the above chem and foam mix to spread + the joy of weh with fellow crewmembers. + - rscadd: new cargo import, 'Lizard Goods Crate', contains random Lizard items like + plushes, foods and maybe a weh-nade or two. Also maybe little tiny lizards + LT3: + - map: Consistency pass on Bubber medbay lobbies for wall healers, door buttons, + and RETA request consoles +2025-12-03: + LT3: + - map: Fixed missing lights in Blueshift medical lobby + - map: Fixed missing door button in Void Raptor medical + - map: Added some water coolers to medical lobbies + SpaceCatSS13: + - qol: You can now copy your characters into other slots. +2025-12-04: + xPokee: + - balance: Radiation storms are now on the 'Moderate' storyteller track. +2025-12-05: + LT3: + - qol: Updated station web maps, now including all the Bubber maps! + Shadow-Quill: + - qol: Slowclap can now be used by all living mobs. +2025-12-06: + BurgerBB: + - map: Fixes various Moonstation issues with power and disposals. + NiklasNeighbor: + - balance: Increased Voidwalker spawn weight to 5 (was 3) + - balance: Decrease minimum population requirement for Voidwalker to 25 (was 30) + explosivekitty: + - rscadd: Prismatic extracts from xenobiology can now be used to recolor clothing + and floor decals +2025-12-07: + Bangle: + - balance: removed debuff flash from Skrell + - code_imp: changed their blood color to oxidized copper + BurgerBB: + - rscadd: ' You do not have to be ready for your vote to count towards storyteller. + Voting statistics for map voting and storyteller voting are displayed. Map votes + have a vote reminder.' + LT3: + - balance: rebalanced something + - code_imp: changed some code + - spellcheck: just make something up, nobody ever reads it anyways +2025-12-08: + LT3: + - map: Medbay lobby now clearly indicates the FREEDOM OF PUNCH ZONE + SapphoQueer: + - bugfix: Fixed a typo in the .38 flare ammo, no longer will it be Flae ammo. + xPokee: + - admin: The Request OPFOR verb now asks for confirmation before pinging every antagonist + enabled player for OPFORs. +2025-12-09: + BurgerBB: + - balance: All items with limited stock or discount limited stock have their discount + limited stock set to 1. + LT3: + - bugfix: Vote reminder doesn't gaslight you into thinking it's a storyteller vote + - bugfix: All sources of forge noise will now respect your ambient volume preference + settings + xPokee: + - bugfix: Fixed the digitigrade sprites not being usable for the classic prisoner + jumpsuit, despite the icon existing. + - image: Added digitigrade sprites for the blue variant of the peacekeeper uniform + and the blonde cowboy uniform. + - rscdel: Removed the imperial/naval hats and jumpsuits. +2025-12-10: + LT3: + - bugfix: Orderly can again enter the paramedic dispatch rooms on Delta, Ice Box, + Meta, and Tram +2025-12-12: + shayoki: + - map: The oxygen canister in Lavaland's mining base is now easier to reach. diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm index 9a4696e24d1..0a020ca7368 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/civilian/civilian.dm @@ -20,12 +20,6 @@ * HEAD OF PERSONNEL */ -/obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial //Rank pins of the Grand Moff - name = "head of personnel's naval jumpsuit" - desc = "A pale green naval suit and a rank badge denoting the Personnel Officer. Target, maximum firepower." - icon_state = "imphop" - supports_variations_flags = NONE - /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade name = "head of personnel's male formal uniform" desc = "A luxurious uniform for the head of personnel, woven in a deep blue. On the lapel is a small pin in the shape of a corgi's head." diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/command.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/command.dm index 9c40d8bb892..0267f18863a 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/command.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/command.dm @@ -22,13 +22,6 @@ icon_state = "terragov_dress" can_adjust = FALSE -/obj/item/clothing/under/rank/captain/skyrat/imperial - name = "captain's naval jumpsuit" - desc = "A white naval suit adorned with golden epaulets and a rank badge denoting a Captain. There are two ways to destroy a person, kill him, or ruin his reputation." - //Rank pins of the Grand Admiral, not a Captain. - icon_state = "impcap" - can_adjust = FALSE - //Donor item for Gandalf - all donors have access /obj/item/clothing/under/rank/captain/skyrat/black name = "captain's black suit" @@ -197,26 +190,6 @@ armor_type = /datum/armor/clothing_under/utility_syndicate has_sensor = NO_SENSORS -/obj/item/clothing/under/rank/captain/skyrat/imperial/generic - desc = "A grey naval suit with a rank badge denoting an Officer. Doesn't protect against blaster fire." - name = "grey officer's naval jumpsuit" - icon_state = "impcom" - -/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants - desc = "A grey naval suit over black pants, with a rank badge denoting an Officer. Doesn't protect against blaster fire." - name = "officer's naval jumpsuit" - icon_state = "impcom_pants" - -/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey - desc = "A dark grey naval suit with a rank badge denoting an Officer. Doesn't protect against blaster fire." - name = "dark grey officer's naval jumpsuit" - icon_state = "impcom_dark" - -/obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red - desc = "A red naval suit with a rank badge denoting an Officer. Doesn't protect against blaster fire." - name = "red officer's naval jumpsuit" - icon_state = "impcom_red" - /* * MISC */ diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm index 180f17d34dc..125d5c1c59c 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/engineering.dm @@ -62,11 +62,6 @@ fire = 10 acid = 50 -/obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial - desc = "A gray naval suit with a lead-lined vest and a rank badge denoting the Officer of the Internal Engineering Division. Doesn't come with a death machine building guide." - name = "chief engineer's naval jumpsuit" - icon_state = "impce" - /* * ATMOS TECH */ diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/medical.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/medical.dm index e8881d9d926..3a7dab16aa1 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/medical.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/medical.dm @@ -96,8 +96,3 @@ /* * CHIEF MEDICAL OFFICER */ - -/obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial //Rank pins of the Brigadier General - desc = "A teal, sterile naval suit with a rank badge denoting the Officer of the Medical Corps. Doesn't protect against blaster fire." - name = "chief medical officer's naval jumpsuit" - icon_state = "impcmo" diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm index ad1be77d31c..a73061cb454 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/rnd.dm @@ -67,11 +67,6 @@ female_sprite_flags = FEMALE_UNIFORM_TOP_ONLY supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial //Rank pins of the Major General - desc = "An off-white naval suit over black pants, with a rank badge denoting the Officer of the Internal Science Division. It's a peaceful life." - name = "research director's naval jumpsuit" - icon_state = "imprd" - /* * OVERRIDES * ORION TODO: look over these when TG finishes their science resprites (any day now...) diff --git a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm index 659accb46fd..5ed33297162 100644 --- a/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm +++ b/modular_skyrat/master_files/code/modules/clothing/under/jobs/security.dm @@ -223,8 +223,3 @@ melee = 10 fire = 50 acid = 40 - -/obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial //Rank pins of the Grand General - desc = "A tar black naval suit and a rank badge denoting the Officer of The Internal Security Division. Be careful your underlings don't bump their head on a door." - name = "head of security's naval jumpsuit" - icon_state = "imphos" diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm index 8ce326f8833..197834ce94b 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/heads.dm @@ -428,27 +428,6 @@ * JOB-LOCKED */ -/datum/loadout_item/head/imperial_cap - name = "Captain's Naval Cap" - item_path = /obj/item/clothing/head/hats/imperial/cap - restricted_roles = list(JOB_CAPTAIN, JOB_NT_REP) - -/datum/loadout_item/head/imperial_hop - name = "Head of Personnel's Naval Cap" - item_path = /obj/item/clothing/head/hats/imperial/hop - restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP) - - -/datum/loadout_item/head/imperial_cmo - name = "Chief Medical Officer's Naval Cap" - item_path = /obj/item/clothing/head/hats/imperial/cmo - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER) - -/datum/loadout_item/head/imperial_ce - name = "Chief Engineer's blast helmet." - item_path = /obj/item/clothing/head/hats/imperial/ce - restricted_roles = list(JOB_CHIEF_ENGINEER) - /datum/loadout_item/head/cowboyhat_sec name = "Cattleman Hat, Security" item_path = /obj/item/clothing/head/cowboy/skyrat/cattleman/sec @@ -464,15 +443,6 @@ item_path = /obj/item/clothing/head/costume/ushanka/sec restricted_roles = list(JOB_WARDEN, JOB_DETECTIVE, JOB_SECURITY_OFFICER, JOB_HEAD_OF_SECURITY, JOB_CORRECTIONS_OFFICER) -/datum/loadout_item/head/blasthelmet - name = "Blast Helmet" - item_path = /obj/item/clothing/head/hats/imperial/helmet - -/datum/loadout_item/head/navybluehoscap - name = "Head of Security's Naval Cap" - item_path = /obj/item/clothing/head/hats/imperial/hos - restricted_roles = list(JOB_HEAD_OF_SECURITY) - /datum/loadout_item/head/navyblueofficerberet name = "Security Officer's Navy Blue beret" item_path = /obj/item/clothing/head/beret/sec/navyofficer @@ -496,22 +466,6 @@ name = "Nurse Hat" item_path = /obj/item/clothing/head/costume/nursehat -/datum/loadout_item/head/imperial_generic - name = "Grey Naval Officer Cap" - item_path = /obj/item/clothing/head/hats/imperial - -/datum/loadout_item/head/imperial_grey - name = "Dark Grey Naval Officer Cap" - item_path = /obj/item/clothing/head/hats/imperial/grey - -/datum/loadout_item/head/imperial_red - name = "Red Naval Officer Cap" - item_path = /obj/item/clothing/head/hats/imperial/red - -/datum/loadout_item/head/imperial_white - name = "White Naval Officer Cap" - item_path = /obj/item/clothing/head/hats/imperial/white - /datum/loadout_item/head/jester name = "Jester hat" item_path = /obj/item/clothing/head/costume/jester diff --git a/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm b/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm index 78f2fff784f..c92f000cd17 100644 --- a/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm +++ b/modular_skyrat/master_files/code/modules/loadout/categories/uniform.dm @@ -52,52 +52,6 @@ name = "Shoredress Wetsuit" item_path = /obj/item/clothing/under/akula_wetsuit -/datum/loadout_item/uniform/jumpsuit/impcap - name = "Captain's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/skyrat/imperial - restricted_roles = list(JOB_CAPTAIN, JOB_NT_REP) - -/datum/loadout_item/uniform/jumpsuit/imphop - name = "Head of Personnel's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial - restricted_roles = list(JOB_HEAD_OF_PERSONNEL, JOB_NT_REP) - -/datum/loadout_item/uniform/jumpsuit/imphos - name = "Head of Security's Naval Uniform" - item_path = /obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial - restricted_roles = list(JOB_HEAD_OF_SECURITY) - -/datum/loadout_item/uniform/jumpsuit/impcmo - name = "Chief Medical Officer's Naval Uniform" - item_path = /obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial - restricted_roles = list(JOB_CHIEF_MEDICAL_OFFICER) - -/datum/loadout_item/uniform/jumpsuit/impce - name = "Chief Engineer's Naval Uniform" - item_path = /obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial - restricted_roles = list(JOB_CHIEF_ENGINEER) - -/datum/loadout_item/uniform/jumpsuit/imprd - name = "Research Director's Naval Uniform" - item_path = /obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial - restricted_roles = list(JOB_RESEARCH_DIRECTOR) - -/datum/loadout_item/uniform/jumpsuit/impcommand - name = "Light Grey Officer's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/skyrat/imperial/generic - -/datum/loadout_item/uniform/jumpsuit/impcom - name = "Grey Officer's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey - -/datum/loadout_item/uniform/jumpsuit/impred - name = "Red Officer's Naval Jumpsuit" - item_path = /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red - -/datum/loadout_item/uniform/jumpsuit/impcomtrous - name = "Grey Officer's Naval Jumpsuit (Trousers)" - item_path = /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants - /datum/loadout_item/uniform/jumpsuit/security_skirt name = "Blue Security Battledress" item_path = /obj/item/clothing/under/rank/security/peacekeeper/skirt diff --git a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi index e2e88290a0a..10168a42359 100644 Binary files a/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi and b/modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/head.dmi b/modular_skyrat/master_files/icons/mob/clothing/head.dmi index b6e896320e6..1eae069f866 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/head.dmi and b/modular_skyrat/master_files/icons/mob/clothing/head.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi index f29940e8527..93456edb63a 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/civilian.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/command.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/command.dmi index 2c69c60ff49..64ac79c2c68 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/command.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/command.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/engineering.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/engineering.dmi index ad295240aa7..9ee0ab5169f 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/engineering.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/engineering.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/medical.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/medical.dmi index 16070f2d27b..66212a175c8 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/medical.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/medical.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/rnd.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/rnd.dmi index 35a612c221e..f4385221d88 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/rnd.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/rnd.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi index 92719af7056..d105b49dd11 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security.dmi differ diff --git a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi index e3d581fa53b..85bcd3ca486 100644 Binary files a/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi and b/modular_skyrat/master_files/icons/mob/clothing/under/security_digi.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi index e4a9828f81d..3ee57d7f264 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/hats.dmi and b/modular_skyrat/master_files/icons/obj/clothing/hats.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/civilian.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/civilian.dmi index e206f2625c5..f9ae28a6847 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/civilian.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/civilian.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/command.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/command.dmi index 15b143b3639..c51aee83be2 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/command.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/command.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/engineering.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/engineering.dmi index a84d0dba3e1..ed269d850d1 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/engineering.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/engineering.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/medical.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/medical.dmi index 7264dcb0752..cacc1aec331 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/medical.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/medical.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/rnd.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/rnd.dmi index 92d1253589e..3906de0b860 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/rnd.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/rnd.dmi differ diff --git a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi index 42273e31b9b..be9bbf4cbf8 100644 Binary files a/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi and b/modular_skyrat/master_files/icons/obj/clothing/under/security.dmi differ diff --git a/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm b/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm index abc6ce63dc7..b48dcbb2155 100644 --- a/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm +++ b/modular_skyrat/modules/colony_fabricator/code/appliances/recycler.dm @@ -60,7 +60,7 @@ SIGNAL_HANDLER flick("recycler_grind", src) - playsound(src, item_recycle_sound, 50, TRUE) + conditional_pref_sound(src, item_recycle_sound, vol = 50, vary = TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE, pref_to_check = /datum/preference/numeric/volume/sound_ambience_volume) use_energy(min(active_power_usage * 0.25, amount_inserted / 100)) if(amount_inserted) diff --git a/modular_skyrat/modules/customization/_globalvars/lists.dm b/modular_skyrat/modules/customization/_globalvars/lists.dm index df9f3640200..8539e50c97f 100644 --- a/modular_skyrat/modules/customization/_globalvars/lists.dm +++ b/modular_skyrat/modules/customization/_globalvars/lists.dm @@ -119,7 +119,7 @@ GLOBAL_LIST_INIT(custom_blood_colors, list( "Lime/Xeno" = BLOOD_COLOR_XENO, "Violet/Avali" = BLOOD_COLOR_VIOLET, "Cyan/Vox" = BLOOD_COLOR_CYAN, - "Brown/Skrell" = BLOOD_COLOR_COPPER, + "Teal/Skrell" = BLOOD_COLOR_COPPER, "White/Nanites" = BLOOD_COLOR_NANITE_SLURRY, "Black" = BLOOD_COLOR_BLACK, )) diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index 442edb1f190..e1f88b97547 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -78,86 +78,6 @@ flags_1 = IS_PLAYER_COLORABLE_1 supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/obj/item/clothing/head/hats/imperial - name = "grey naval officer cap" - desc = "A grey naval cap with a silver disk in the center." - icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' - icon_state = "impcom" - supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON - -/obj/item/clothing/head/hats/imperial/grey - name = "dark grey naval officer cap" - desc = "A dark grey naval cap with a silver disk in the center." - icon_state = "impcommand" - -/obj/item/clothing/head/hats/imperial/red - name = "red naval officer cap" - desc = "A red naval cap with a silver disk in the center." - icon_state = "impcap_red" - -/obj/item/clothing/head/hats/imperial/white - name = "white naval officer cap" - desc = "A white naval cap with a silver disk in the center." - icon_state = "impcap" - -/obj/item/clothing/head/hats/imperial/cap - name = "captain's naval officer cap" - desc = "A white naval cap with a silver disk in the center." - icon_state = "impcap" - -/obj/item/clothing/head/hats/imperial/hop - name = "head of personnel's naval officer cap" - desc = "An olive naval cap with a silver disk in the center." - icon_state = "imphop" - -/obj/item/clothing/head/hats/imperial/hos - name = "head of security's naval officer cap" - desc = "A tar black naval cap with a silver disk in the center." - icon_state = "imphos" - armor_type = /datum/armor/hats_hos - -/obj/item/clothing/head/hats/imperial/cmo - name = "chief medical officer's naval cap" - desc = "A teal naval cap with a silver disk in the center." - icon_state = "impcmo" - -/obj/item/clothing/head/hats/imperial/ce - name = "chief engineer's blast helmet" - desc = "Despite seeming like it's made of metal, it's actually a very cheap plastic.." - armor_type = /datum/armor/imperial_ce - clothing_flags = STOPSPRESSUREDAMAGE - heat_protection = HEAD - max_heat_protection_temperature = FIRE_HELM_MAX_TEMP_PROTECT - cold_protection = HEAD - min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT - icon_state = "impce" - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT - - -/datum/armor/imperial_ce - melee = 15 - bullet = 5 - laser = 20 - energy = 10 - bomb = 20 - bio = 10 - fire = 100 - acid = 50 - wound = 10 - -/obj/item/clothing/head/hats/imperial/helmet - name = "blast helmet" - desc = "A sharp helmet with some goggles on the top. Unfortunately, both those and the helmet itself are made of flimsy plastic." //No armor moment - icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' - worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' - icon_state = "blast_helmet" - supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON - -/obj/item/clothing/head/hats/imperial/helmet/Initialize(mapload) - . = ..() - AddComponent(/datum/component/toggle_icon, "goggles") - /obj/item/clothing/head/soft/yankee name = "fashionable baseball cap" desc = "Rimmed and brimmed." diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm index b727a3269c9..c5dea9106a3 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/skrell.dm @@ -125,7 +125,7 @@ desc = "Large black orbs." icon = 'modular_skyrat/modules/organs/icons/skrell_organ.dmi' icon_state = "eyes" - flash_protect = FLASH_PROTECTION_SENSITIVE + flash_protect = FLASH_PROTECTION_NONE //flash buff given their weakness to brute and cold /obj/item/organ/lungs/skrell name = "skrell lungs" diff --git a/modular_skyrat/modules/emote_panel/code/emote_panel.dm b/modular_skyrat/modules/emote_panel/code/emote_panel.dm index 485fef9ad18..58396cdb983 100644 --- a/modular_skyrat/modules/emote_panel/code/emote_panel.dm +++ b/modular_skyrat/modules/emote_panel/code/emote_panel.dm @@ -147,7 +147,8 @@ /mob/living/proc/emote_purr, /mob/living/proc/emote_moo, /mob/living/proc/emote_honk1, - /mob/living/proc/emote_mggaow + /mob/living/proc/emote_mggaow, + /mob/living/proc/emote_slowclap ) all_emotes += skyrat_living_emotes @@ -184,7 +185,6 @@ /mob/living/proc/emote_ping, /mob/living/proc/emote_sad, /mob/living/proc/emote_warn, - /mob/living/proc/emote_slowclap ) all_emotes += synth_emotes var/static/list/allowed_species_synth = list( @@ -723,6 +723,11 @@ set category = "Emotes+" usr.emote("clap1", intentional = TRUE) +/mob/living/proc/emote_slowclap() + set name = "> Slow Clap" + set category = "Emotes" + usr.emote("slowclap", intentional = TRUE) + /mob/living/proc/emote_headtilt() set name = "~ Head Hilt" set category = "Emotes+" @@ -978,11 +983,6 @@ set category = "Emotes" usr.emote("warn", intentional = TRUE) -/mob/living/proc/emote_slowclap() - set name = "< Slow Clap >" - set category = "Emotes" - usr.emote("slowclap", intentional = TRUE) - // modular_skyrat\modules\emotes\code\additionalemotes\overlay_emote.dm /mob/living/proc/emote_sweatdrop() set name = "| Sweatdrop |" diff --git a/modular_skyrat/modules/emotes/code/emotes.dm b/modular_skyrat/modules/emotes/code/emotes.dm index d7fff1a7349..f7a690feb6a 100644 --- a/modular_skyrat/modules/emotes/code/emotes.dm +++ b/modular_skyrat/modules/emotes/code/emotes.dm @@ -275,6 +275,12 @@ return pick('modular_zubbers/sound/emotes/claponce1.ogg', 'modular_zubbers/sound/emotes/claponce2.ogg') +/datum/emote/living/slowclap + key = "slowclap" + message = "activates their slow clap processor." + emote_type = EMOTE_AUDIBLE + sound = 'sound/machines/slowclap.ogg' + /datum/emote/living/clap1/can_run_emote(mob/living/carbon/user, status_check = TRUE , intentional) if(!istype(user) || user.usable_hands < 2) return FALSE diff --git a/modular_skyrat/modules/goofsec/code/department_guards.dm b/modular_skyrat/modules/goofsec/code/department_guards.dm index 54c6eb58d43..922191d1936 100644 --- a/modular_skyrat/modules/goofsec/code/department_guards.dm +++ b/modular_skyrat/modules/goofsec/code/department_guards.dm @@ -339,6 +339,7 @@ ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, + ACCESS_PARAMEDIC, ACCESS_PHARMACY, ACCESS_PLUMBING, ACCESS_SECURITY, @@ -354,6 +355,7 @@ ACCESS_MEDICAL, ACCESS_MINERAL_STOREROOM, ACCESS_MORGUE, + ACCESS_PARAMEDIC, ACCESS_PHARMACY, ACCESS_PLUMBING, ACCESS_SECURITY, diff --git a/modular_skyrat/modules/opposing_force/code/admin_procs.dm b/modular_skyrat/modules/opposing_force/code/admin_procs.dm index c9207b412d5..58b89e67f5f 100644 --- a/modular_skyrat/modules/opposing_force/code/admin_procs.dm +++ b/modular_skyrat/modules/opposing_force/code/admin_procs.dm @@ -1,4 +1,8 @@ ADMIN_VERB(request_more_opfor, R_FUN, "Request OPFOR", "Request players sign up for opfor if they have antag on.", ADMIN_CATEGORY_FUN) + var/confirm = tgui_alert(user, "Please confirm you want to ask all antagonist enabled players to submit an OPFOR?", "Confirm Request OPFOR", list("Yes", "No")) + if(confirm != "Yes") + return + var/asked = 0 for(var/mob/living/carbon/human/human in GLOB.alive_player_list) if(human.client?.prefs?.read_preference(/datum/preference/toggle/be_antag)) diff --git a/modular_skyrat/modules/reagent_forging/code/anvil.dm b/modular_skyrat/modules/reagent_forging/code/anvil.dm index 49daf07f7a3..2780e7e3ecc 100644 --- a/modular_skyrat/modules/reagent_forging/code/anvil.dm +++ b/modular_skyrat/modules/reagent_forging/code/anvil.dm @@ -79,7 +79,7 @@ return ITEM_INTERACT_SUCCESS /obj/structure/reagent_anvil/hammer_act(mob/living/user, obj/item/tool) - conditional_pref_sound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', vol = 50, vary = TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE, pref_to_check = /datum/preference/numeric/volume/sound_ambience_volume) + conditional_pref_sound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', vol = 35, vary = TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE, pref_to_check = /datum/preference/numeric/volume/sound_ambience_volume) //do we have an incomplete item to hammer out? if so, here is our block of code var/obj/item/forging/incomplete/locate_incomplete = locate() in contents @@ -148,7 +148,7 @@ locate_obj.repair_damage(locate_obj.get_integrity() + 10) user.mind.adjust_experience(/datum/skill/smithing, 5) //repairing does give some experience - playsound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', 50, TRUE, ignore_walls = FALSE) + conditional_pref_sound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', vol = 35, vary = TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE, pref_to_check = /datum/preference/numeric/volume/sound_ambience_volume) return ITEM_INTERACT_SUCCESS diff --git a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm index 19c54dcccc7..46146e5068a 100644 --- a/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm +++ b/modular_skyrat/modules/reagent_forging/code/crafting_bench.dm @@ -182,7 +182,7 @@ return ITEM_INTERACT_SUCCESS /obj/structure/reagent_crafting_bench/hammer_act(mob/living/user, obj/item/tool) - playsound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', 50, TRUE) + conditional_pref_sound(src, 'modular_skyrat/modules/reagent_forging/sound/forge.ogg', vol = 35, vary = TRUE, extrarange = MEDIUM_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE, pref_to_check = /datum/preference/numeric/volume/sound_ambience_volume) if(length(contents)) if(!istype(contents[1], /obj/item/forging/complete)) balloon_alert(user, "invalid item") diff --git a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm index 5de257abd9c..1bfd6420ba1 100644 --- a/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm +++ b/modular_zubbers/code/_globalvars/lists/maintenance_loot_uncommon.dm @@ -323,6 +323,7 @@ GLOBAL_LIST_INIT(uncommon_loot, list(//uncommon: useful items /obj/item/grenade/chem_grenade/glitter/blue = 100, /obj/item/grenade/chem_grenade/metalfoam = 100, /obj/item/grenade/chem_grenade/smart_metal_foam = 75, + /obj/item/grenade/chem_grenade/wehnade = 75, /obj/item/grenade/chem_grenade/teargas = 25, /obj/item/grenade/firecracker = 25, /obj/item/grenade/flashbang = 10, diff --git a/modular_zubbers/code/controllers/subsystem/vote.dm b/modular_zubbers/code/controllers/subsystem/vote.dm index 6bd6a5aed23..8c204ed87db 100644 --- a/modular_zubbers/code/controllers/subsystem/vote.dm +++ b/modular_zubbers/code/controllers/subsystem/vote.dm @@ -36,7 +36,7 @@ if(current_vote.vote_sound && (late_voter.prefs.read_preference(/datum/preference/toggle/sound_announcements))) SEND_SOUND(late_voter, sound(current_vote.vote_sound)) - to_chat(late_voter, vote_font(fieldset_block("Storyteller Vote", "It's time to make your choices! Type 'vote' or click here to place your votes.", "boxed_message purple_box"))) + to_chat(late_voter, vote_font(fieldset_block("[current_vote.name] Vote", "It's time to make your choices! Type 'vote' or click here to place your votes.", "boxed_message purple_box"))) /** * Ranked choice voting, where voters rank options in order of preference. diff --git a/modular_zubbers/code/datums/votes/map_vote.dm b/modular_zubbers/code/datums/votes/map_vote.dm new file mode 100644 index 00000000000..30a621823d4 --- /dev/null +++ b/modular_zubbers/code/datums/votes/map_vote.dm @@ -0,0 +1,6 @@ +/datum/vote/map_vote/create_vote() + . = ..() + if(.) + var/filtered_players = get_active_player_count(alive_check = FALSE, afk_check = TRUE, human_check = FALSE) + var/observing_players = length(GLOB.current_observers_list) + log_vote("Players at vote creation: Filtered: [filtered_players] | Total: [GLOB.clients.len] | Observing: [observing_players]") diff --git a/modular_zubbers/code/game/objects/effects/decals/turfdecal/tilecoloring.dm b/modular_zubbers/code/game/objects/effects/decals/turfdecal/tilecoloring.dm new file mode 100644 index 00000000000..beddd6d64ac --- /dev/null +++ b/modular_zubbers/code/game/objects/effects/decals/turfdecal/tilecoloring.dm @@ -0,0 +1,5 @@ +/obj/effect/turf_decal/trimline/purple/punch + name = "punch zone" + icon = 'modular_zubbers/icons/turf/decals.dmi' + icon_state = "trimline_warn_punch" + color = "#D381C9" diff --git a/modular_zubbers/code/modules/cargo/cargo_spawners.dm b/modular_zubbers/code/modules/cargo/cargo_spawners.dm new file mode 100644 index 00000000000..c790bc53f5d --- /dev/null +++ b/modular_zubbers/code/modules/cargo/cargo_spawners.dm @@ -0,0 +1,24 @@ +/obj/effect/spawner/random/lizard_crate + name = "lizard loot spawner" + desc = "What wondrous lizard related good could it contain?" + icon_state = "plushie" + loot = list( + //plushies + /obj/item/toy/plush/lizard_plushie/space = 20, + /obj/item/toy/plush/lizard_plushie/space/green = 20, + /obj/item/toy/plush/lizard_plushie/greyscale = 20, + /obj/item/toy/plush/lizard_plushie/green = 40, + /obj/item/toy/plush/lizard_plushie = 30, + + //wehnade + /obj/item/grenade/chem_grenade/wehnade = 15, + + //assorted lizard foods + /obj/item/food/tiziran_sausage = 10, + /obj/item/food/headcheese_slice = 10, + /obj/item/storage/box/spaceman_ration/meats/lizard = 5, + /obj/item/food/root_flatbread = 10, + + //lil lizards + /mob/living/basic/lizard = 40, + ) diff --git a/modular_zubbers/code/modules/cargo/packs/contraband.dm b/modular_zubbers/code/modules/cargo/packs/contraband.dm index ad85113f0eb..1eab3dab04b 100644 --- a/modular_zubbers/code/modules/cargo/packs/contraband.dm +++ b/modular_zubbers/code/modules/cargo/packs/contraband.dm @@ -16,3 +16,12 @@ crate_name = "patriotic crate" contraband = TRUE +/datum/supply_pack/imports/lizardgoodscrate + name = "Lizard Goods Crate" + desc = "Limited edition Lizard Goods Crate! Contains a random assortment of your FAVOURITE lizard related items, including the coveted 'weh-nade'" + cost = CARGO_CRATE_VALUE * 3 + contains = list( + /obj/effect/spawner/random/lizard_crate = 8 + ) + crate_name = "lizard goods crate" + contraband = TRUE diff --git a/modular_zubbers/code/modules/fun_items/grenades.dm b/modular_zubbers/code/modules/fun_items/grenades.dm new file mode 100644 index 00000000000..8147d637c3f --- /dev/null +++ b/modular_zubbers/code/modules/fun_items/grenades.dm @@ -0,0 +1,17 @@ +/obj/item/grenade/chem_grenade/wehnade + name = "wehnade" + desc = "A weird, old looking grenade casing. If you shake it you can hear liquid inside. It has no markings on it beside a hand written sticker that says 'Weh'!" + stage = GRENADE_READY + +/obj/item/grenade/chem_grenade/wehnade/Initialize(mapload) + . = ..() + var/obj/item/reagent_containers/cup/beaker/beaker_one = new(src) + var/obj/item/reagent_containers/cup/beaker/beaker_two = new(src) + + beaker_one.reagents.add_reagent(/datum/reagent/fluorosurfactant, 30) + beaker_two.reagents.add_reagent(/datum/reagent/water, 30) + beaker_one.reagents.add_reagent(/datum/reagent/juice_that_makes_you_weh, 30) + beaker_two.reagents.add_reagent(/datum/reagent/juice_that_makes_you_weh, 30) + + beakers += beaker_one + beakers += beaker_two diff --git a/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm index 0775da60303..ef0f1184d43 100644 --- a/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/modular_zubbers/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -393,6 +393,30 @@ "Your blood coagulates!" = MUT_MSG_EXTENDED, "You feel a yearning for flesh and brains" = MUT_MSG_ABOUT2TURN) +//New chemical which only causes people to perform the 'weh' emote. No way to create this, currently will only be in rare foam grenades found as loot +/datum/reagent/juice_that_makes_you_weh + name = "Juice That Makes You Weh" + description = "A strange green chemical, will cause iliving beings to 'weh' uncontrollably for a time" + color = "#37e427" // rgb: 165, 240, 238 + taste_description = "an odd sweetness with a hint of spice" + metabolization_rate = 2 // metabolises 10x faster, will occur more often but not hang around for ages + penetrates_skin = VAPOR + ph = 5.5 + +//This code allows it to randomly proc regularly, causing a random pitch 'weh' sound +/datum/reagent/juice_that_makes_you_weh/on_mob_life(mob/living/carbon/affected_mob, seconds_per_tick, times_fired) + . = ..() + + if (prob(50)) + to_chat(affected_mob, span_warning("You feel the urge to weh...")) + addtimer(CALLBACK(src, PROC_REF(do_weh), affected_mob), rand(1, 4) SECONDS) + +/datum/reagent/juice_that_makes_you_weh/proc/do_weh(mob/living/carbon/M) + if (QDELETED(M)) + return + M.emote("weh") + + #undef MUT_MSG_IMMEDIATE #undef MUT_MSG_EXTENDED #undef MUT_MSG_ABOUT2TURN diff --git a/modular_zubbers/code/modules/reagents/reagent_dispenser.dm b/modular_zubbers/code/modules/reagents/reagent_dispenser.dm new file mode 100644 index 00000000000..85143938d22 --- /dev/null +++ b/modular_zubbers/code/modules/reagents/reagent_dispenser.dm @@ -0,0 +1,3 @@ +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical + name = "medical punch dispenser" + desc = "It's got ELECTROLYTES! Only to be consumed in the freedom of a dispenser zone. The punch zone is practiced without conflicting with institutional policies, public safety, or daily operations." diff --git a/modular_zubbers/code/modules/research/xenobiology/crossbreeding/prismatic.dm b/modular_zubbers/code/modules/research/xenobiology/crossbreeding/prismatic.dm new file mode 100644 index 00000000000..95b7e8abc1f --- /dev/null +++ b/modular_zubbers/code/modules/research/xenobiology/crossbreeding/prismatic.dm @@ -0,0 +1,27 @@ +/obj/item/slimecross/prismatic/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!(isturf(interacting_with) || isclothing(interacting_with)) || isspaceturf(interacting_with)) + return NONE + var/colour_priority = WASHABLE_COLOUR_PRIORITY + if(isclothing(interacting_with)) + colour_priority = FIXED_COLOUR_PRIORITY + var/saturation_mode = SATURATION_MULTIPLY + if (LAZYACCESS(modifiers, RIGHT_CLICK)) + saturation_mode = SATURATION_OVERRIDE + user.do_attack_animation(interacting_with) + interacting_with.add_atom_colour(color_transition_filter(paintcolor, saturation_mode), colour_priority) + playsound(interacting_with, 'sound/effects/slosh.ogg', 20, TRUE) + return ITEM_INTERACT_SUCCESS + +/obj/item/slimecross/prismatic/grey + effect_desc = "When used it restores the orginal color of whatever it hits." + +/obj/item/slimecross/prismatic/grey/interact_with_atom(atom/interacting_with, mob/living/user, list/modifiers) + if(!(isturf(interacting_with) || isclothing(interacting_with)) || isspaceturf(interacting_with)) + return NONE + user.do_attack_animation(interacting_with) + if(isturf(interacting_with)) + interacting_with.remove_atom_colour(WASHABLE_COLOUR_PRIORITY) + if(isclothing(interacting_with)) + interacting_with.remove_atom_colour(FIXED_COLOUR_PRIORITY) + playsound(interacting_with, 'sound/effects/slosh.ogg', 20, TRUE) + return ITEM_INTERACT_SUCCESS diff --git a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm index 6ca68f80beb..6d7188d4d89 100644 --- a/modular_zubbers/code/modules/security/sec_clothing_overrides.dm +++ b/modular_zubbers/code/modules/security/sec_clothing_overrides.dm @@ -1094,8 +1094,8 @@ desc = "A blue shirt and dark jeans, with a pair of spurred cowboy boots to boot." icon = 'modular_skyrat/master_files/icons/donator/obj/clothing/uniform.dmi' //Donator item-ish? See the /armorless one below it worn_icon = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform.dmi' + worn_icon_digi = 'modular_skyrat/master_files/icons/donator/mob/clothing/uniform_digi.dmi' icon_state = "cowboy_uniform" - supports_variations_flags = NONE can_adjust = FALSE /obj/item/clothing/under/rank/security/detective/cowboy/armorless //Donator variant, just uses the sprite. @@ -1107,7 +1107,6 @@ icon = 'modular_skyrat/master_files/icons/obj/clothing/under/security.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/under/security.dmi' icon_state = "runner" - supports_variations_flags = NONE can_adjust = FALSE //Warden @@ -1266,9 +1265,6 @@ /obj/item/clothing/under/rank/security/head_of_security/peacekeeper unique_reskin = null -/obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial - unique_reskin = null - /obj/item/clothing/under/rank/security/head_of_security/bunnysuit unique_reskin = null @@ -1294,7 +1290,6 @@ desc = "A mustard coloured prison jumpskirt, often worn by former Security members, informants and former CentCom employees. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "/obj/item/clothing/under/rank/prisoner/skirt/protcust" greyscale_colors = "#FFB600" - supports_variations_flags = NONE /obj/item/clothing/under/rank/prisoner/lowsec name = "low security prisoner jumpsuit" @@ -1307,7 +1302,6 @@ desc = "A pale, almost creamy prison jumpskirt, this one denotes a low security prisoner, things like fraud and anything white collar. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "/obj/item/clothing/under/rank/prisoner/skirt/lowsec" greyscale_colors = "#AB9278" - supports_variations_flags = NONE /obj/item/clothing/under/rank/prisoner/highsec name = "high risk prisoner jumpsuit" @@ -1320,7 +1314,6 @@ desc = "A bright red prison jumpskirt, depending on who sees it, either a badge of honour or a sign to avoid. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "/obj/item/clothing/under/rank/prisoner/skirt/highsec" greyscale_colors = "#FF3400" - supports_variations_flags = NONE /obj/item/clothing/under/rank/prisoner/supermax name = "supermax prisoner jumpsuit" @@ -1333,7 +1326,6 @@ desc = "A dark crimson red prison jumpskirt, for the worst of the worst, or the Clown. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "/obj/item/clothing/under/rank/prisoner/skirt/supermax" greyscale_colors = "#992300" - supports_variations_flags = NONE /obj/item/clothing/under/rank/prisoner/classic name = "classic prisoner jumpsuit" @@ -1348,7 +1340,7 @@ greyscale_config_inhand_left = null greyscale_config_inhand_right = null greyscale_config_worn = null - supports_variations_flags = NONE + supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION /obj/item/clothing/under/rank/prisoner/syndicate name = "syndicate prisoner jumpsuit" @@ -1363,7 +1355,6 @@ icon_state = "/obj/item/clothing/under/rank/prisoner/skirt/syndicate" greyscale_colors = "#992300" has_sensor = FALSE - supports_variations_flags = NONE /obj/item/clothing/under/rank/prisoner/syndicate/station name = "syndicate prisoner jumpsuit" diff --git a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm index 1e8bd074a06..7831b57da6b 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/ghostset/voidwalker.dm @@ -4,9 +4,9 @@ name = "Spawn Void Walker" typepath = /datum/round_event/ghost_role/void_walker max_occurrences = 1 - weight = 3 + weight = 5 earliest_start = 20 MINUTES - min_players = 30 + min_players = 25 category = EVENT_CATEGORY_ENTITIES description = "A Void Walker that drags people out of the station and into the abyss" map_flags = EVENT_SPACE_ONLY diff --git a/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm b/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm index 486ffa3bf7c..fcc712fc223 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/major/major_overrides.dm @@ -23,10 +23,6 @@ /datum/round_event_control/meteor_wave/catastrophic weight = 0 -/datum/round_event_control/radiation_storm - track = EVENT_TRACK_MAJOR - tags = list(TAG_COMMUNAL) - /datum/round_event_control/wormholes track = EVENT_TRACK_MAJOR tags = list(TAG_COMMUNAL) diff --git a/modular_zubbers/code/modules/storyteller/event_defines/moderate/moderate_overrides.dm b/modular_zubbers/code/modules/storyteller/event_defines/moderate/moderate_overrides.dm index cbf1fd67f41..86adda8fb88 100644 --- a/modular_zubbers/code/modules/storyteller/event_defines/moderate/moderate_overrides.dm +++ b/modular_zubbers/code/modules/storyteller/event_defines/moderate/moderate_overrides.dm @@ -57,3 +57,7 @@ /datum/round_event_control/operative track = EVENT_TRACK_MODERATE + +/datum/round_event_control/radiation_storm + track = EVENT_TRACK_MODERATE + tags = list(TAG_COMMUNAL) diff --git a/modular_zubbers/code/modules/storyteller/gamemode.dm b/modular_zubbers/code/modules/storyteller/gamemode.dm index cb715786ac2..d20b3d745ea 100644 --- a/modular_zubbers/code/modules/storyteller/gamemode.dm +++ b/modular_zubbers/code/modules/storyteller/gamemode.dm @@ -139,7 +139,6 @@ SUBSYSTEM_DEF(gamemode) var/wizardmode = FALSE var/storyteller_voted = FALSE - var/ready_only_vote = FALSE var/datum/vote/storyteller/vote_datum /datum/controller/subsystem/gamemode/Initialize(time, zlevel) @@ -756,13 +755,6 @@ SUBSYSTEM_DEF(gamemode) log_dynamic("Roundstart picked storyteller [storyteller_pick.name] randomly due to no vote result.") voted_storyteller = storyteller_pick - if(ready_only_vote) - var/processed_storyteller = process_storyteller_vote() - if(!isnull(processed_storyteller)) - voted_storyteller = processed_storyteller - else - stack_trace("Processing storyteller vote results failed! That's less than ideal. Using backup non-weighted result [voted_storyteller]") - set_storyteller(voted_storyteller) if(vote_datum) var/list/vote_results = vote_datum.elimination_results @@ -781,46 +773,6 @@ SUBSYSTEM_DEF(gamemode) channel_tag, ) -/datum/controller/subsystem/gamemode/proc/process_storyteller_vote() - var/list/players = list() - if(!length(vote_datum?.choices_by_ckey)) - return - - for(var/mob/dead/new_player/player as anything in GLOB.new_player_list) - if(player.ready == PLAYER_READY_TO_PLAY) - players += player.ckey - - log_dynamic("[players.len] players ready! Processing storyteller vote results.") - - for(var/vote in vote_datum.choices_by_ckey) - if(!vote_datum.choices_by_ckey[vote]) - continue - var/vote_string = "[vote]" - var/list/vote_components = splittext(vote_string, "_") - var/vote_ckey = vote_components[1] - var/vote_storyteller = vote_components[2] - if(players.Find(vote_ckey)) - log_dynamic("VALID: [vote_ckey] voted for [vote_storyteller]") - else - log_dynamic("INVALID: [vote_ckey] not eligible to vote for [vote_storyteller]") - if(vote_datum.choices_by_ckey[vote] == 1) //only the player's 1st choice is mapped in the other table - vote_datum.choices[vote_storyteller]-- - vote_datum.choices_by_ckey -= vote - - var/list/vote_winner = vote_datum.get_vote_result() - log_dynamic("Storyteller vote winner is [vote_winner[1]]") - to_chat(GLOB.admins, - type = MESSAGE_TYPE_ADMINLOG, - html = span_vote_notice(fieldset_block("Storyteller", "Selected storyteller: [vote_winner[1]]", "boxed_message blue_box")), - confidential = TRUE, - ) - for(var/storyteller_type in storytellers) - var/datum/storyteller/storyboy = storytellers[storyteller_type] - if(storyboy.name == vote_winner[1]) - return storyteller_type - - stack_trace("Storyteller [vote_winner[1]] was declared vote winner, but couldn't locate datum in storytellers! This should never happen!") - /** * set_storyteller * diff --git a/modular_zubbers/code/modules/storyteller/storyteller_vote.dm b/modular_zubbers/code/modules/storyteller/storyteller_vote.dm index c1634e2fbec..9aa2dedf850 100644 --- a/modular_zubbers/code/modules/storyteller/storyteller_vote.dm +++ b/modular_zubbers/code/modules/storyteller/storyteller_vote.dm @@ -10,30 +10,18 @@ has_desc = TRUE count_method = VOTE_COUNT_METHOD_RANKED winner_method = VOTE_WINNER_METHOD_RANKED - ranked_winner_threshold = 70 // 70% threshold for direct win + ranked_winner_threshold = 50 display_statistics = FALSE vote_reminder = TRUE - /// Only readied players can vote - var/ready_only = TRUE /datum/vote/storyteller/New() . = ..() default_choices = list() default_choices = SSgamemode.storyteller_vote_choices() -/datum/vote/storyteller/initiate_vote(initiator, duration) - . = ..() - to_chat(world, vote_font(fieldset_block("Storyteller Vote", "[span_vote_notice("Only players who are ready and joining the game round start will be calculated in voting results.")]", "boxed_message purple_box"))) - /datum/vote/storyteller/return_desc(vote_name) return SSgamemode.storyteller_desc(vote_name) -/datum/vote/storyteller/get_result_text(winners, final_winner, non_voters) - if(!ready_only) - return ..() - - return fieldset_block("Storyteller Vote", "Storyteller voting is now closed! Storyteller will be determined when the round starts.", "boxed_message purple_box") - /datum/vote/storyteller/create_vote() . = ..() if((length(choices) == 1)) // Only one choice, no need to vote. @@ -54,8 +42,7 @@ /datum/vote/storyteller/finalize_vote(winning_option) SSgamemode.storyteller_vote_result(winning_option) SSgamemode.storyteller_voted = TRUE - if(ready_only) - SSgamemode.ready_only_vote = TRUE + /* ### PERSISTENCE SUBSYSTEM TRACKING BELOW ### diff --git a/modular_zubbers/code/modules/uplink/uplink_items.dm b/modular_zubbers/code/modules/uplink/uplink_items.dm new file mode 100644 index 00000000000..0e2ebdff3b9 --- /dev/null +++ b/modular_zubbers/code/modules/uplink/uplink_items.dm @@ -0,0 +1,4 @@ +/datum/uplink_item/New() + . = ..() + if(limited_stock > 0 || limited_discount_stock > 1) + limited_discount_stock = 1 diff --git a/modular_zubbers/code/modules/vending/comdrobe.dm b/modular_zubbers/code/modules/vending/comdrobe.dm index ea3e5512154..78b7086bb6b 100644 --- a/modular_zubbers/code/modules/vending/comdrobe.dm +++ b/modular_zubbers/code/modules/vending/comdrobe.dm @@ -23,7 +23,6 @@ /obj/item/clothing/head/hats/caphat = 1, /obj/item/clothing/head/caphat/beret = 1, /obj/item/clothing/head/caphat/beret/alt = 1, - /obj/item/clothing/head/hats/imperial/cap = 1, /obj/item/clothing/head/hats/warden/drill/captain = 1, /obj/item/clothing/head/hats/warden/drill/blueshield = 1, /obj/item/clothing/head/hats/caphat/parade = 1, @@ -36,7 +35,6 @@ /obj/item/clothing/under/rank/captain/dress = 1, /obj/item/clothing/under/rank/captain/skyrat/kilt = 1, /obj/item/clothing/under/rank/captain/skyrat/shipdress = 1, - /obj/item/clothing/under/rank/captain/skyrat/imperial = 1, /obj/item/clothing/under/rank/captain/skyrat/pilot = 1, /obj/item/clothing/under/rank/captain/skyrat/pilot/skirt = 1, /obj/item/clothing/under/rank/captain/dress = 1, @@ -93,14 +91,12 @@ /obj/item/clothing/head/hats/hopcap = 1, /obj/item/clothing/head/hopcap/beret = 1, /obj/item/clothing/head/hopcap/beret/alt = 1, - /obj/item/clothing/head/hats/imperial/hop = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skirt = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/turtleneck/skirt = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade = 1, /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/parade/female = 1, - /obj/item/clothing/under/rank/civilian/head_of_personnel/skyrat/imperial = 1, /obj/item/clothing/suit/armor/vest/hop/hop_formal = 1, /obj/item/clothing/suit/hooded/wintercoat/hop = 1, /obj/item/clothing/neck/cloak/hop = 1, @@ -119,12 +115,10 @@ access_lists["[ACCESS_CMO]"] = list( /obj/item/clothing/head/beret/medical/cmo = 1, /obj/item/clothing/head/beret/medical/cmo/alt = 1, - /obj/item/clothing/head/hats/imperial/cmo = 1, /obj/item/clothing/head/utility/surgerycap/cmo = 1, /obj/item/clothing/under/rank/medical/chief_medical_officer = 1, /obj/item/clothing/under/rank/medical/chief_medical_officer/skirt = 1, /obj/item/clothing/under/rank/medical/chief_medical_officer/turtleneck = 1, - /obj/item/clothing/under/rank/medical/chief_medical_officer/skyrat/imperial = 1, /obj/item/clothing/under/rank/medical/chief_medical_officer/scrubs = 1, /obj/item/clothing/suit/hooded/wintercoat/medical/cmo = 1, /obj/item/clothing/neck/cloak/cmo = 1, @@ -146,7 +140,6 @@ /obj/item/clothing/under/rank/rnd/research_director/turtleneck/skirt = 1, /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit = 1, /obj/item/clothing/under/rank/rnd/research_director/skyrat/jumpsuit/skirt = 1, - /obj/item/clothing/under/rank/rnd/research_director/skyrat/imperial = 1, /obj/item/clothing/neck/cloak/rd = 1, /obj/item/clothing/neck/mantle/rdmantle = 1, /obj/item/clothing/suit/toggle/labcoat = 1, @@ -164,12 +157,10 @@ /obj/item/clothing/head/beret/engi/ce = 1, /obj/item/clothing/head/utility/hardhat/white = 1, /obj/item/clothing/head/utility/hardhat/welding/white = 1, - /obj/item/clothing/head/hats/imperial/ce = 1, /obj/item/clothing/under/rank/engineering/chief_engineer = 1, /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck = 1, /obj/item/clothing/under/rank/engineering/chief_engineer/skirt = 1, /obj/item/clothing/under/rank/engineering/chief_engineer/turtleneck/skirt = 1, - /obj/item/clothing/under/rank/engineering/chief_engineer/skyrat/imperial = 1, /obj/item/clothing/suit/hooded/wintercoat/engineering/ce = 1, /obj/item/clothing/neck/cloak/ce = 1, /obj/item/clothing/neck/mantle/cemantle = 1, @@ -183,7 +174,6 @@ access_lists["[ACCESS_HOS]"] = list( /obj/item/clothing/head/hats/hos/cap = 1, /obj/item/clothing/head/hats/hos/beret/navyhos = 1, - /obj/item/clothing/head/hats/imperial/hos = 1, /obj/item/clothing/head/hats/hos/beret = 1, /obj/item/clothing/head/hats/warden/drill/hos = 1, /obj/item/clothing/head/hats/hos/elofy = 1, @@ -191,7 +181,6 @@ /obj/item/clothing/under/rank/security/head_of_security/alt = 1, /obj/item/clothing/under/rank/security/head_of_security/alt/skirt = 1, /obj/item/clothing/under/rank/security/head_of_security/grey = 1, - /obj/item/clothing/under/rank/security/head_of_security/skyrat/imperial = 1, /obj/item/clothing/under/rank/security/head_of_security/alt/roselia = 1, /obj/item/clothing/under/rank/security/head_of_security/parade = 1, /obj/item/clothing/under/rank/security/head_of_security/parade/female = 1, @@ -275,20 +264,11 @@ ) access_lists["[ACCESS_COMMAND]"] = list( - /obj/item/clothing/head/hats/imperial = 5, - /obj/item/clothing/head/hats/imperial/grey = 5, - /obj/item/clothing/head/hats/imperial/white = 5, - /obj/item/clothing/head/hats/imperial/red = 5, - /obj/item/clothing/head/hats/imperial/helmet = 5, /obj/item/clothing/head/hats/caphat/naval/fleet_admiral = 5, /obj/item/clothing/suit/armor/vest/bridge = 5, /obj/item/clothing/suit/armor/skyy = 5, /obj/item/clothing/glasses/sunglasses/gar/giga = 5, /obj/item/clothing/neck/cloak/fleet_admiral = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/grey = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/pants = 5, - /obj/item/clothing/under/rank/captain/skyrat/imperial/generic/red = 5, /obj/item/clothing/under/rank/bridge_assistant = 5, /obj/item/clothing/under/rank/bridge_assistant/skirt = 5, /obj/item/clothing/under/rank/bridge_assistant/turtle = 5, diff --git a/modular_zubbers/code/modules/voting/vote_overrides.dm b/modular_zubbers/code/modules/voting/vote_overrides.dm index f1a50fd9c84..e63c2636980 100644 --- a/modular_zubbers/code/modules/voting/vote_overrides.dm +++ b/modular_zubbers/code/modules/voting/vote_overrides.dm @@ -2,6 +2,8 @@ count_method = VOTE_COUNT_METHOD_RANKED winner_method = VOTE_WINNER_METHOD_RANKED display_statistics = FALSE + ranked_winner_threshold = 50 + vote_reminder = TRUE /datum/vote/map_vote/finalize_vote(winning_option) SSmap_vote.finalize_map_vote(src, winning_option) diff --git a/modular_zubbers/icons/turf/decals.dmi b/modular_zubbers/icons/turf/decals.dmi new file mode 100644 index 00000000000..392e5248def Binary files /dev/null and b/modular_zubbers/icons/turf/decals.dmi differ diff --git a/tgstation.dme b/tgstation.dme index 62c34b564b6..cc5aa172e21 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8989,6 +8989,7 @@ #include "modular_zubbers\code\datums\storage\subtypes\belts.dm" #include "modular_zubbers\code\datums\storage\subtypes\others\misc.dm" #include "modular_zubbers\code\datums\votes\_vote_datum.dm" +#include "modular_zubbers\code\datums\votes\map_vote.dm" #include "modular_zubbers\code\datums\weather\weather_types\radiation_storm.dm" #include "modular_zubbers\code\datums\weather\weather_types\sand_storm.dm" #include "modular_zubbers\code\datums\wounds\permanent_limp.dm" @@ -9046,6 +9047,7 @@ #include "modular_zubbers\code\game\objects\effects\overlays.dm" #include "modular_zubbers\code\game\objects\effects\decals\blood.dm" #include "modular_zubbers\code\game\objects\effects\decals\cleanable.dm" +#include "modular_zubbers\code\game\objects\effects\decals\turfdecal\tilecoloring.dm" #include "modular_zubbers\code\game\objects\effects\effects_system\effect_sparks.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\armory.dm" #include "modular_zubbers\code\game\objects\effects\spawners\random\moonstation_random.dm" @@ -9206,6 +9208,7 @@ #include "modular_zubbers\code\modules\bow_adjustments\bow.dm" #include "modular_zubbers\code\modules\bsrpd\code\bsrpd.dm" #include "modular_zubbers\code\modules\bubber_tram\code\moonstation_tram.dm" +#include "modular_zubbers\code\modules\cargo\cargo_spawners.dm" #include "modular_zubbers\code\modules\cargo\expressconsole.dm" #include "modular_zubbers\code\modules\cargo\bounties\assistant.dm" #include "modular_zubbers\code\modules\cargo\bounties\blacksmith.dm" @@ -9373,6 +9376,7 @@ #include "modular_zubbers\code\modules\food_and_drinks\recipes\drinks\drinks_non-alcoholic.dm" #include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_pizza.dm" #include "modular_zubbers\code\modules\food_and_drinks\recipes\tablecraft\recipes_seafood.dm" +#include "modular_zubbers\code\modules\fun_items\grenades.dm" #include "modular_zubbers\code\modules\GAGS\greyscale_configs.dm" #include "modular_zubbers\code\modules\ghost_wavedefence\wave_def.dm" #include "modular_zubbers\code\modules\ghostcafe\hilbertshotel_silicon.dm" @@ -9636,6 +9640,7 @@ #include "modular_zubbers\code\modules\quote_of_the_round\ticker.dm" #include "modular_zubbers\code\modules\ratqueen\regalrat.dm" #include "modular_zubbers\code\modules\reagents\drink_reagents.dm" +#include "modular_zubbers\code\modules\reagents\reagent_dispenser.dm" #include "modular_zubbers\code\modules\reagents\chemistry\reagents\food_reagents.dm" #include "modular_zubbers\code\modules\reagents\chemistry\reagents\other_reagents.dm" #include "modular_zubbers\code\modules\reagents\chemistry\reagents\Recipes\others.dm" @@ -9659,6 +9664,7 @@ #include "modular_zubbers\code\modules\research\designs\autolathe\security_designs.dm" #include "modular_zubbers\code\modules\research\techweb\all_nodes.dm" #include "modular_zubbers\code\modules\research\techweb\circuit_nodes.dm" +#include "modular_zubbers\code\modules\research\xenobiology\crossbreeding\prismatic.dm" #include "modular_zubbers\code\modules\rimpoint_newfeatures\code\umbrella.dm" #include "modular_zubbers\code\modules\rr_opt_in\examine.dm" #include "modular_zubbers\code\modules\rr_opt_in\rr_opt_config.dm" @@ -9789,6 +9795,7 @@ #include "modular_zubbers\code\modules\title_screen\code\title_screen_subsystem.dm" #include "modular_zubbers\code\modules\uplink\one_shot_emag.dm" #include "modular_zubbers\code\modules\uplink\uplink_devices.dm" +#include "modular_zubbers\code\modules\uplink\uplink_items.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\badass.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\bundle.dm" #include "modular_zubbers\code\modules\uplink\uplink_items\dangerous.dm" diff --git a/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx b/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx index d7846249310..d9570c38a96 100644 --- a/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx +++ b/tgui/packages/tgui/interfaces/PreferencesMenu/CharacterPreferences/index.tsx @@ -1,6 +1,6 @@ import { useState } from 'react'; import { useBackend } from 'tgui/backend'; -import { NoticeBox, Stack } from 'tgui-core/components'; +import { NoticeBox, Stack, Button } from 'tgui-core/components'; // BUBBER EDIT CHANGE - ORIGINAL : import { NoticeBox, Stack } from 'tgui-core/components'; import { exhaustiveCheck } from 'tgui-core/exhaustive'; import { SideDropdown } from '../../../bubber_components/SideDropdown'; // BUBBER EDIT ADDITION @@ -138,6 +138,17 @@ export function CharacterPreferenceWindow(props) { profiles={data.character_profiles} /> + {/* BUBBER EDIT ADDITION BEGIN */} + +