diff --git a/_maps/map_files/Birdshot/birdshot.dmm b/_maps/map_files/Birdshot/birdshot.dmm index ec0ab80110d..39193e190da 100644 --- a/_maps/map_files/Birdshot/birdshot.dmm +++ b/_maps/map_files/Birdshot/birdshot.dmm @@ -3917,6 +3917,7 @@ /obj/machinery/door/airlock{ name = "Maintenance" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/plating, /area/station/maintenance/central/greater) "bwz" = ( @@ -13458,7 +13459,10 @@ "eOZ" = ( /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/airalarm/directional/north, -/turf/open/floor/iron/showroomfloor, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "ePk" = ( /obj/structure/disposalpipe/segment{ @@ -18797,7 +18801,9 @@ /obj/structure/cable, /obj/machinery/portable_atmospherics/canister/oxygen, /obj/machinery/power/apc/auto_name/directional/north, -/turf/open/floor/iron/showroomfloor, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted, +/obj/effect/turf_decal/siding/white, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "gCg" = ( /obj/machinery/computer/records/medical, @@ -21883,6 +21889,7 @@ cycle_id = "comms-entrance-south" }, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "hAu" = ( @@ -28078,6 +28085,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "juo" = ( @@ -33331,6 +33339,7 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "lfa" = ( @@ -33651,6 +33660,7 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "liP" = ( @@ -34942,6 +34952,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "lDo" = ( @@ -37294,6 +37305,7 @@ name = "Telecommunications Server Room" }, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "mrt" = ( @@ -38443,7 +38455,7 @@ dir = 8 }, /obj/machinery/light/cold/directional/east, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "mLM" = ( /obj/effect/turf_decal/siding/wood{ @@ -46478,6 +46490,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/freezer, /area/station/service/kitchen) "pFk" = ( @@ -46778,6 +46791,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/junction{ dir = 1 }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "pJv" = ( @@ -47432,7 +47446,13 @@ "pUx" = ( /obj/structure/closet/crate/freezer/blood, /obj/machinery/camera/autoname/directional/east, -/turf/open/floor/iron/showroomfloor, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "pUy" = ( /obj/effect/turf_decal/siding/thinplating_new/terracotta, @@ -54828,6 +54848,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/simple/dark/hidden, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "srH" = ( @@ -55781,6 +55802,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_white, /area/station/science/server) "sJi" = ( @@ -56464,6 +56486,7 @@ /obj/machinery/door/airlock/medical/glass{ name = "Medical Cold Room" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/white/small, /area/station/medical/coldroom) "sUe" = ( @@ -63599,6 +63622,7 @@ cycle_id = "comms-entrance-south" }, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "vhI" = ( @@ -64294,6 +64318,7 @@ }, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "vrf" = ( @@ -64553,6 +64578,7 @@ /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron, /area/station/science/xenobiology) "vuD" = ( @@ -66070,6 +66096,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "vSW" = ( @@ -66102,6 +66129,7 @@ cycle_id = "comms-entrance-north" }, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/tcommsat/server) "vTj" = ( @@ -69193,7 +69221,13 @@ /area/station/security/prison) "wOn" = ( /obj/structure/closet/crate/freezer/blood, -/turf/open/floor/iron/showroomfloor, +/obj/effect/turf_decal/tile/dark_blue/half/contrasted{ + dir = 1 + }, +/obj/effect/turf_decal/siding/white{ + dir = 1 + }, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "wOp" = ( /turf/closed/wall, @@ -69741,7 +69775,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 8 }, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "wWz" = ( /obj/effect/decal/cleanable/dirt, diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index abd47555fce..ac7d0229b73 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -178,6 +178,7 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron, /area/station/medical/coldroom) "acp" = ( @@ -13576,6 +13577,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/hidden, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron, /area/station/science/xenobiology) "dpO" = ( @@ -27373,7 +27375,7 @@ /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/kitchen_coldroom/dark, /area/station/medical/coldroom) "gJj" = ( /obj/effect/decal/cleanable/dirt, @@ -29419,7 +29421,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/kitchen_coldroom/dark, /area/station/medical/coldroom) "hlT" = ( /obj/structure/cable, @@ -30750,6 +30752,7 @@ /obj/machinery/door/firedoor, /obj/machinery/duct, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "hFQ" = ( @@ -35758,7 +35761,7 @@ dir = 1 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/kitchen_coldroom/dark, /area/station/medical/coldroom) "iTW" = ( /obj/structure/closet/emcloset, @@ -36682,7 +36685,7 @@ pixel_x = 16 }, /obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, +/turf/open/floor/iron/kitchen_coldroom/dark, /area/station/medical/coldroom) "jex" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -46950,6 +46953,7 @@ dir = 4 }, /obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron, /area/station/maintenance/port/fore) "lGF" = ( @@ -55948,7 +55952,8 @@ /obj/effect/turf_decal/bot_white{ color = "#435a88" }, -/turf/open/floor/iron/freezer, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "nZb" = ( /obj/effect/turf_decal/tile/blue/half/contrasted{ @@ -63371,6 +63376,7 @@ /area/station/service/library/lounge) "pSh" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/tcommsat/server) "pSj" = ( @@ -67510,7 +67516,7 @@ /obj/effect/turf_decal/bot_white{ color = "#435a88" }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "qSJ" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -70932,6 +70938,7 @@ "rMt" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/tcommsat/server) "rMv" = ( @@ -73338,7 +73345,7 @@ /obj/effect/turf_decal/bot_white{ color = "#435a88" }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "sqm" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -92973,7 +92980,7 @@ color = "#435a88" }, /obj/structure/closet/crate/freezer/blood, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "xkW" = ( /obj/structure/window/reinforced/spawner/directional/west, @@ -93041,6 +93048,7 @@ /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/science/server) "xlM" = ( diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index 29425a84e4d..4d1d0459919 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1166,6 +1166,7 @@ /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 10 }, +/obj/machinery/status_display/ai/directional/east, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "aqQ" = ( @@ -1284,10 +1285,8 @@ /turf/open/floor/iron, /area/station/commons/dorms) "asf" = ( -/obj/machinery/atmospherics/components/binary/pump/on{ - dir = 8 - }, -/turf/open/floor/plating/snowed/coldroom, +/obj/structure/plasticflaps/kitchen, +/turf/open/floor/iron/dark, /area/station/service/kitchen/coldroom) "asg" = ( /obj/structure/closet, @@ -3419,6 +3418,7 @@ "aVI" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "aVL" = ( @@ -3452,7 +3452,6 @@ "aWj" = ( /obj/structure/cable, /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/lesser) "aWk" = ( @@ -4337,8 +4336,7 @@ req_access = list("kitchen") }, /obj/effect/turf_decal/siding/white, -/obj/item/radio/intercom/directional/east, -/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "biE" = ( @@ -5207,11 +5205,13 @@ /area/station/hallway/secondary/entry) "btq" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/components/binary/pump/on/general/hidden{ + dir = 8 + }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "bts" = ( @@ -8002,6 +8002,9 @@ /obj/structure/cable, /obj/structure/minecart_rail/railbreak, /obj/machinery/atmospherics/pipe/heat_exchanging/simple, +/obj/structure/disposalpipe/segment{ + dir = 10 + }, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "ceS" = ( @@ -8582,6 +8585,18 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/iron/smooth, /area/station/security/lockers) +"cnp" = ( +/obj/structure/minecart_rail{ + dir = 4 + }, +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 1 + }, +/obj/machinery/light/small/red/directional/north, +/obj/structure/sign/warning/directional/north, +/turf/open/floor/plating/snowed/coldroom, +/area/icemoon/underground/explored) "cnq" = ( /obj/effect/spawner/structure/window/reinforced, /obj/machinery/atmospherics/pipe/smart/simple/cyan/visible, @@ -13203,19 +13218,25 @@ /obj/machinery/airalarm/directional/south, /turf/open/floor/wood, /area/station/security/courtroom) +"dEx" = ( +/obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 4 + }, +/obj/structure/minecart_rail{ + dir = 1 + }, +/obj/effect/turf_decal/weather/snow/corner{ + dir = 8 + }, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) "dEz" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/carpet, /area/station/security/prison/rec) -"dED" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/manifold, -/turf/open/floor/plating/snowed/coldroom, -/area/station/service/kitchen/coldroom) "dEI" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, @@ -13669,6 +13690,8 @@ /obj/item/pickaxe, /obj/item/toy/figure/chef, /obj/structure/sign/warning/cold_temp/directional/north, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/plating, /area/station/service/kitchen/coldroom) "dLL" = ( @@ -14392,6 +14415,7 @@ dir = 4 }, /obj/structure/cable, +/obj/effect/turf_decal/weather/snow/corner, /turf/open/floor/plating/snowed/coldroom, /area/icemoon/underground/explored) "dXv" = ( @@ -14825,12 +14849,8 @@ /turf/open/floor/iron/white, /area/station/medical/medbay/central) "ees" = ( -/obj/structure/kitchenspike, -/obj/machinery/status_display/evac/directional/west, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, -/turf/open/floor/plating/snowed/coldroom, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/service/kitchen/coldroom) "eeD" = ( /obj/machinery/light/directional/west, @@ -15814,14 +15834,6 @@ }, /turf/open/floor/iron/showroomfloor, /area/station/security/processing) -"esY" = ( -/obj/effect/decal/cleanable/dirt/dust, -/obj/structure/disposalpipe/segment{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "eta" = ( /obj/machinery/camera/directional/west{ c_tag = "Central Hallway East" @@ -16185,6 +16197,8 @@ /turf/open/floor/plating, /area/station/maintenance/fore) "eyP" = ( +/obj/structure/kitchenspike, +/obj/effect/turf_decal/weather/snow/corner, /turf/open/misc/ice/coldroom, /area/station/service/kitchen/coldroom) "eyR" = ( @@ -18607,10 +18621,10 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/station/tcommsat/server) "fja" = ( -/obj/machinery/light/cold/directional/east, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 9 +/obj/structure/disposalpipe/segment{ + dir = 6 }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "fjg" = ( @@ -24574,7 +24588,16 @@ /turf/open/floor/plating, /area/station/maintenance/aft/greater) "gWi" = ( -/turf/closed/wall, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/machinery/door/airlock/freezer{ + desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; + name = "The Ice Box" + }, +/obj/structure/plasticflaps/kitchen, +/turf/open/floor/plating, /area/station/service/kitchen/coldroom) "gWn" = ( /obj/machinery/atmospherics/components/trinary/filter/flipped{ @@ -26449,6 +26472,16 @@ /obj/structure/cable, /turf/open/floor/plating, /area/station/security/brig/entrance) +"hAj" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 4 + }, +/obj/effect/turf_decal/weather/snow/corner, +/turf/open/floor/plating/snowed/coldroom, +/area/station/service/kitchen/coldroom) "hAl" = ( /obj/machinery/door/firedoor{ dir = 8 @@ -26760,6 +26793,11 @@ /obj/structure/closet/emcloset, /turf/open/floor/iron/dark, /area/mine/eva) +"hEv" = ( +/obj/structure/chair/stool/directional/west, +/obj/effect/spawner/random/trash/cigbutt, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "hED" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -30046,9 +30084,6 @@ pixel_x = -2; pixel_y = 4 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 4 - }, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "iBl" = ( @@ -30500,7 +30535,6 @@ /turf/open/floor/carpet/lone, /area/station/service/chapel) "iKd" = ( -/obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/siding/white, /obj/effect/turf_decal/siding/white{ dir = 1 @@ -30509,6 +30543,8 @@ /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/suit/hooded/wintercoat, +/obj/structure/window/spawner/directional/south, +/obj/machinery/newscaster/directional/west, /turf/open/floor/plating, /area/station/service/kitchen/coldroom) "iKh" = ( @@ -33383,11 +33419,9 @@ /turf/open/floor/iron/showroomfloor, /area/station/security/warden) "jBB" = ( -/obj/structure/kitchenspike, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 8 - }, -/turf/open/floor/plating/snowed/coldroom, +/obj/machinery/atmospherics/pipe/heat_exchanging/junction, +/obj/effect/spawner/structure/window, +/turf/open/floor/plating, /area/station/service/kitchen/coldroom) "jBR" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater{ @@ -34707,6 +34741,7 @@ name = "Server Room" }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/science/server) "jUb" = ( @@ -34715,9 +34750,6 @@ pixel_x = 6; pixel_y = 3 }, -/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ - dir = 6 - }, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "jUi" = ( @@ -38270,6 +38302,9 @@ /obj/structure/railing/corner/end/flip{ dir = 4 }, +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "kUt" = ( @@ -41472,13 +41507,11 @@ /obj/structure/minecart_rail{ dir = 1 }, -/obj/item/radio/intercom/directional/west{ - frequency = 1453; - name = "Kitchen Intercom" - }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 6 }, +/obj/item/radio/intercom/directional/north, +/obj/machinery/status_display/evac/directional/west, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "lOI" = ( @@ -44886,6 +44919,9 @@ }, /area/station/command/gateway) "mQk" = ( +/obj/effect/turf_decal/weather/snow/corner{ + dir = 10 + }, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "mQq" = ( @@ -48707,10 +48743,10 @@ name = "The Ice Box"; req_access = list("kitchen") }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ - dir = 1 - }, /obj/effect/turf_decal/siding/white, +/obj/machinery/atmospherics/components/binary/valve/on{ + dir = 4 + }, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "nRq" = ( @@ -48740,17 +48776,12 @@ /turf/open/floor/catwalk_floor/iron_smooth, /area/station/maintenance/port/lesser) "nRE" = ( -/obj/machinery/door/airlock/freezer{ - desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; - name = "The Ice Box" - }, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, /obj/structure/cable, /turf/open/floor/plating, -/area/station/service/kitchen/coldroom) +/area/station/maintenance/starboard/lesser) "nRV" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/extinguisher_cabinet/directional/south, @@ -49000,11 +49031,17 @@ /turf/open/floor/iron/white, /area/station/science/robotics/lab) "nVJ" = ( -/obj/structure/cable, -/obj/structure/disposalpipe/segment{ - dir = 10 +/obj/machinery/door/airlock/freezer{ + desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; + name = "The Ice Box" }, -/turf/open/floor/plating/snowed/coldroom, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, +/obj/structure/cable, +/obj/structure/plasticflaps/kitchen, +/turf/open/floor/plating, /area/station/service/kitchen/coldroom) "nVR" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -50441,7 +50478,6 @@ "oqE" = ( /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/access/all/service/kitchen, /obj/machinery/door/airlock/maintenance{ name = "Kitchen Maintenance" @@ -52337,6 +52373,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "oPI" = ( @@ -52837,6 +52874,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/visible, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/freezer, /area/station/science/xenobiology) "oXx" = ( @@ -53483,15 +53521,6 @@ /obj/effect/decal/cleanable/blood/splatter, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/underground/explored) -"pgR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/heat_exchanging/junction{ - dir = 8 - }, -/turf/open/floor/plating/snowed/coldroom, -/area/station/service/kitchen/coldroom) "pgY" = ( /obj/machinery/cryo_cell, /obj/effect/turf_decal/stripes/line{ @@ -53930,11 +53959,14 @@ /area/station/service/kitchen/coldroom) "pnw" = ( /obj/structure/cable, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/structure/railing{ dir = 1 }, +/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "pnA" = ( @@ -54217,11 +54249,12 @@ /turf/open/floor/plating, /area/station/science/xenobiology) "prX" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/machinery/atmospherics/pipe/heat_exchanging/simple{ + dir = 9 }, -/obj/machinery/atmospherics/components/binary/valve/on{ - dir = 4 +/obj/machinery/light/cold/directional/east, +/obj/structure/disposalpipe/segment{ + dir = 9 }, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) @@ -54949,6 +54982,7 @@ /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/spawner/random/trash/cigbutt, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "pBA" = ( @@ -56307,8 +56341,9 @@ /turf/open/genturf, /area/icemoon/surface/outdoors/unexplored/rivers/no_monsters) "pWE" = ( -/obj/structure/disposalpipe/segment, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/structure/disposalpipe/segment{ + dir = 9 + }, /turf/open/floor/plating, /area/station/maintenance/starboard/lesser) "pWJ" = ( @@ -59350,6 +59385,10 @@ "qOl" = ( /turf/open/floor/wood, /area/station/maintenance/port/aft) +"qOo" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "qOu" = ( /obj/effect/turf_decal/tile/neutral/fourcorners, /turf/open/floor/iron/dark, @@ -61760,6 +61799,13 @@ /obj/item/clothing/suit/apron/chef, /turf/open/floor/plating, /area/station/maintenance/department/medical/morgue) +"rwN" = ( +/obj/effect/spawner/structure/window/reinforced/tinted, +/obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ + dir = 4 + }, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "rwR" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/status_display/evac/directional/west, @@ -62468,6 +62514,11 @@ }, /turf/open/floor/iron/white, /area/station/medical/pharmacy) +"rGI" = ( +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/effect/spawner/structure/window/reinforced/tinted, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "rGY" = ( /obj/machinery/airalarm/directional/east, /obj/structure/table, @@ -62881,6 +62932,7 @@ /area/station/service/kitchen/coldroom) "rOx" = ( /obj/structure/flora/rock/pile/icy/style_random, +/obj/structure/kitchenspike, /turf/open/misc/asteroid/snow/coldroom, /area/station/service/kitchen/coldroom) "rOA" = ( @@ -63113,12 +63165,13 @@ /obj/structure/minecart_rail{ dir = 1 }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, /obj/machinery/atmospherics/pipe/heat_exchanging/simple{ dir = 5 }, +/obj/structure/disposalpipe/segment{ + dir = 5 + }, +/obj/machinery/light/cold/directional/west, /turf/open/floor/plating/snowed/coldroom, /area/station/service/kitchen/coldroom) "rSe" = ( @@ -67535,9 +67588,8 @@ /obj/structure/railing{ dir = 1 }, -/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ - dir = 4 - }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "tei" = ( @@ -68250,18 +68302,6 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/wood, /area/station/maintenance/fore) -"tnR" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/door/airlock/freezer{ - desc = "The freezer where the chef keeps all the stuff that needs to be kept cold. Ice cold."; - name = "The Ice Box" - }, -/obj/effect/mapping_helpers/airlock/access/all/service/kitchen, -/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, -/turf/open/floor/plating, -/area/station/maintenance/starboard/lesser) "tnY" = ( /obj/structure/sign/nanotrasen{ pixel_x = -32 @@ -68915,6 +68955,11 @@ /obj/structure/chair/office, /turf/open/floor/wood, /area/station/service/library) +"tyA" = ( +/obj/effect/decal/cleanable/dirt/dust, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/turf/open/floor/plating, +/area/station/maintenance/starboard/lesser) "tyK" = ( /obj/item/mop, /obj/item/reagent_containers/cup/bucket, @@ -70446,6 +70491,7 @@ "tVF" = ( /obj/machinery/airalarm/directional/north, /obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/obj/item/radio/intercom/directional/west, /turf/open/floor/iron/freezer, /area/station/service/kitchen/coldroom) "tWc" = ( @@ -74178,12 +74224,13 @@ /turf/open/floor/iron/cafeteria, /area/station/security/prison/work) "vcD" = ( -/obj/structure/window/reinforced/spawner/directional/south, /obj/effect/turf_decal/siding/white{ dir = 5 }, /obj/effect/turf_decal/siding/white, /obj/structure/closet/emcloset, +/obj/machinery/atmospherics/pipe/smart/manifold4w/dark/visible, +/obj/structure/window/spawner/directional/south, /turf/open/floor/plating, /area/station/service/kitchen/coldroom) "vcO" = ( @@ -83560,13 +83607,6 @@ }, /turf/open/floor/iron/dark, /area/mine/mechbay) -"xOc" = ( -/obj/machinery/light/cold/directional/west, -/obj/structure/disposalpipe/segment{ - dir = 5 - }, -/turf/open/floor/plating/snowed/coldroom, -/area/station/service/kitchen/coldroom) "xOk" = ( /obj/structure/marker_beacon/burgundy, /obj/effect/mapping_helpers/no_atoms_ontop, @@ -84302,11 +84342,6 @@ /obj/effect/mapping_helpers/no_atoms_ontop, /turf/open/misc/asteroid/snow/icemoon, /area/icemoon/surface/outdoors/nospawn) -"xZv" = ( -/obj/machinery/status_display/ai/directional/east, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply, -/turf/open/floor/plating/snowed/coldroom, -/area/station/service/kitchen/coldroom) "xZy" = ( /obj/structure/stairs/east, /obj/effect/turf_decal/trimline/neutral/line, @@ -188512,7 +188547,7 @@ fCA ehh jPL oPC -jre +hEv nRE jre jre @@ -188520,7 +188555,7 @@ jre jre dom dom -rJc +cnp psb psb qZZ @@ -188771,7 +188806,7 @@ jMr jre jre nVJ -xOc +jre eyP rtw rOx @@ -189032,7 +189067,7 @@ rRT yfs sTl sTl -yfs +dEx gTr jgC psb @@ -189283,9 +189318,9 @@ tVF kUo iKd ees -jDF +anW sdF -rcR +hAj fwB fwB fwB @@ -189540,9 +189575,9 @@ sRz tec vcD jBB -anW +jDF jUb -dED +rcR mQk fwB nNg @@ -189799,7 +189834,7 @@ nRn asf anW iBi -pgR +rcR mbM oje gYq @@ -190053,7 +190088,7 @@ jre dLA pnw biu -xZv +asf aqH fja prX @@ -190307,13 +190342,13 @@ nNe hts hQv jre -jre +rwN oqE -jre +rGI jre jre gWi -tnR +jre jre jre jre @@ -190566,11 +190601,11 @@ jre jre nzU aWj -wSs -oXE +qOo +tyA fOS pWE -esY +oXE wSs tpc jre diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 9bc3b2ccc2c..d0e476d0c2f 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -11650,6 +11650,7 @@ "ehY" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/tcommsat/server) "ehZ" = ( @@ -16038,6 +16039,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/structure/cable, /obj/effect/mapping_helpers/airlock/access/all/medical/general, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/plating, /area/station/maintenance/port/aft) "fLo" = ( @@ -27971,6 +27973,7 @@ opacity = 0 }, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron, /area/station/science/xenobiology) "jSk" = ( @@ -31369,6 +31372,7 @@ /obj/machinery/door/airlock/freezer{ name = "Freezer" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/cafeteria, /area/station/service/kitchen/coldroom) "lbh" = ( @@ -54006,6 +54010,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/effect/turf_decal/tile/purple/fourcorners, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/science/server) "tbI" = ( @@ -60143,6 +60148,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/medical/coldroom) "vif" = ( @@ -65970,6 +65976,7 @@ "xgL" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/light/small/directional/east, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "xgN" = ( diff --git a/_maps/map_files/NebulaStation/NebulaStation.dmm b/_maps/map_files/NebulaStation/NebulaStation.dmm index 77b9ec66cb7..3b8def7ca06 100644 --- a/_maps/map_files/NebulaStation/NebulaStation.dmm +++ b/_maps/map_files/NebulaStation/NebulaStation.dmm @@ -24824,6 +24824,7 @@ /obj/structure/cable, /obj/structure/curtain, /obj/effect/turf_decal/weather/snow, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "dIN" = ( @@ -25150,6 +25151,7 @@ /obj/machinery/door/airlock/freezer{ name = "Freezer" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/service/kitchen/coldroom) "dMg" = ( @@ -30314,6 +30316,7 @@ name = "Medbay Maintenance" }, /obj/effect/mapping_helpers/airlock/access/all/medical/surgery, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/plating, /area/station/maintenance/port/fore) "eyr" = ( @@ -40489,6 +40492,7 @@ "fZB" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/glass/reinforced, /area/station/engineering/supermatter/room/upper) "fZK" = ( @@ -57575,6 +57579,7 @@ /obj/machinery/atmospherics/pipe/layer_manifold/supply/hidden{ dir = 4 }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/plating, /area/station/maintenance/port/fore) "iAX" = ( @@ -69595,7 +69600,8 @@ /obj/item/tank/internals/anesthetic, /obj/machinery/light/small/directional/south, /obj/effect/turf_decal/weather/snow, -/obj/machinery/light_switch/directional/east, +/obj/machinery/airalarm/directional/south, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "koc" = ( @@ -100029,6 +100035,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/general/hidden, /obj/effect/mapping_helpers/airlock/access/all/science/rd, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/science/server) "oQc" = ( @@ -106567,8 +106574,8 @@ dir = 9 }, /obj/machinery/iv_drip, -/obj/structure/sign/poster/official/random/directional/north, /obj/effect/turf_decal/weather/snow, +/obj/machinery/light_switch/directional/west, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "pKX" = ( @@ -107733,6 +107740,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/cyan/visible, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/science/xenobiology) "pTz" = ( @@ -135157,6 +135165,12 @@ }, /turf/open/floor/iron/dark, /area/station/science/cytology) +"uax" = ( +/obj/structure/cable, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/structure/sign/poster/official/safety_internals/directional/east, +/turf/open/floor/plating, +/area/station/maintenance/port/fore) "uaz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/cable, @@ -158956,6 +158970,7 @@ dir = 8 }, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark/textured, /area/station/tcommsat/computer) "xIb" = ( @@ -259606,7 +259621,7 @@ aWl oPA hCZ iae -ktw +uax rdE ktw wBm diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 9559e19e30c..c77b2ff3597 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -1466,6 +1466,7 @@ /obj/machinery/door/airlock/freezer{ name = "Freezer" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor, /area/station/service/kitchen/coldroom) "aeO" = ( @@ -3819,7 +3820,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 1 }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "ayr" = ( /obj/effect/landmark/start/cargo_technician, @@ -4643,7 +4644,7 @@ "aHb" = ( /obj/structure/extinguisher_cabinet/directional/south, /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "aHe" = ( /obj/effect/decal/cleanable/dirt, @@ -4934,7 +4935,9 @@ "aJf" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/iron/freezer, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "aJi" = ( /obj/machinery/washing_machine, @@ -11298,6 +11301,7 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/freezer, /area/station/medical/coldroom) "cPD" = ( @@ -11569,7 +11573,7 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/light/cold/directional/west, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "cTM" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -13888,7 +13892,7 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/freezer/blood, /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "dJJ" = ( /turf/closed/wall, @@ -15385,7 +15389,8 @@ /obj/structure/cable, /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/airalarm/directional/west, -/turf/open/floor/iron/freezer, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "elV" = ( /obj/machinery/duct, @@ -16026,7 +16031,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "eyh" = ( /obj/effect/turf_decal/siding/wood{ @@ -31522,6 +31527,7 @@ /obj/effect/turf_decal/trimline/purple/filled/line{ dir = 8 }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/white, /area/station/science/xenobiology) "kff" = ( @@ -32689,7 +32695,7 @@ /obj/effect/turf_decal/bot, /obj/structure/closet/crate/freezer/surplus_limbs, /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "kAF" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -35882,7 +35888,7 @@ pixel_x = 22; pixel_y = 8 }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "lDo" = ( /obj/structure/table, @@ -37196,7 +37202,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ dir = 1 }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "lYA" = ( /obj/structure/easel, @@ -38651,6 +38657,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/circuit/telecomms/server, /area/station/science/server) "mAS" = ( @@ -39661,6 +39668,12 @@ /obj/structure/altar_of_gods, /turf/open/floor/iron/dark, /area/station/service/chapel) +"mVp" = ( +/obj/effect/turf_decal/trimline/blue/filled/line, +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, +/turf/open/floor/iron/white, +/area/station/medical/storage) "mVS" = ( /obj/structure/window/reinforced/spawner/directional/south, /obj/machinery/door/window/left/directional/west{ @@ -48378,7 +48391,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "qcu" = ( /obj/effect/turf_decal/trimline/red/filled/line{ @@ -48739,7 +48752,7 @@ /area/station/service/bar) "qif" = ( /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "qik" = ( /obj/structure/sign/warning/radiation, @@ -52710,6 +52723,7 @@ /area/station/maintenance/tram/mid) "rBW" = ( /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/tcommsat/computer) "rBZ" = ( @@ -53008,6 +53022,7 @@ /obj/effect/turf_decal/tile/blue/opposingcorners{ dir = 1 }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/freezer, /area/station/medical/coldroom) "rJM" = ( @@ -63428,7 +63443,7 @@ c_tag = "Medical - Cold Storage" }, /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "vjb" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer4{ @@ -67325,7 +67340,7 @@ pixel_x = 22; pixel_y = -8 }, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "wDt" = ( /obj/effect/landmark/event_spawn, @@ -68554,6 +68569,8 @@ /turf/open/floor/iron, /area/station/security/prison) "xck" = ( +/obj/machinery/holopad, +/obj/effect/turf_decal/bot, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "xcp" = ( @@ -70291,7 +70308,7 @@ "xMU" = ( /obj/structure/cable, /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "xMV" = ( /obj/structure/railing/corner{ @@ -70700,7 +70717,7 @@ /obj/machinery/smartfridge/organ, /obj/structure/sign/warning/cold_temp/directional/east, /obj/effect/turf_decal/tile/blue/opposingcorners, -/turf/open/floor/iron/freezer, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "xUC" = ( /obj/effect/spawner/random/engineering/tracking_beacon, @@ -165942,7 +165959,7 @@ jyH jyH jyH wyR -aKM +mVp fMZ xRx bWU diff --git a/_maps/map_files/wawastation/wawastation.dmm b/_maps/map_files/wawastation/wawastation.dmm index aef16b29d62..773b67a1f53 100644 --- a/_maps/map_files/wawastation/wawastation.dmm +++ b/_maps/map_files/wawastation/wawastation.dmm @@ -5873,6 +5873,7 @@ }, /obj/machinery/light/small/dim/directional/north, /obj/structure/cable/layer3, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark/telecomms, /area/station/tcommsat/server) "cdI" = ( @@ -10422,7 +10423,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{ dir = 4 }, -/turf/open/floor/iron/showroomfloor, +/obj/effect/mapping_helpers/airalarm/tlv_cold_room, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "dHW" = ( /obj/effect/turf_decal/tile/brown/anticorner/contrasted, @@ -12997,7 +12999,7 @@ /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/machinery/power/apc/auto_name/directional/west, /obj/structure/cable, -/turf/open/floor/iron, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "eCp" = ( /obj/machinery/power/terminal{ @@ -13626,7 +13628,7 @@ }, /obj/machinery/portable_atmospherics/canister/anesthetic_mix, /obj/machinery/light_switch/directional/east, -/turf/open/floor/iron, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "ePC" = ( /obj/machinery/power/apc/auto_name/directional/west, @@ -15432,6 +15434,7 @@ }, /obj/effect/mapping_helpers/airlock/access/all/science/rd, /obj/structure/cable, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/dark, /area/station/science/server) "fyS" = ( @@ -22718,6 +22721,7 @@ /obj/effect/mapping_helpers/airlock/access/all/medical/surgery, /obj/structure/cable, /obj/machinery/duct, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/plating, /area/station/medical/coldroom) "hXu" = ( @@ -23045,7 +23049,7 @@ /obj/item/wrench/medical, /obj/item/food/strawberryicecreamsandwich, /obj/machinery/light/dim/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "iel" = ( /obj/machinery/atmospherics/components/unary/thermomachine/heater/on, @@ -23500,6 +23504,7 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron, /area/station/science/xenobiology) "inC" = ( @@ -31463,6 +31468,8 @@ }, /obj/effect/turf_decal/tile/blue/fourcorners, /obj/effect/mapping_helpers/airlock/access/all/science/xenobio, +/obj/structure/plasticflaps/kitchen, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/glass/reinforced, /area/station/science/xenobiology) "laf" = ( @@ -39342,7 +39349,7 @@ network = list("ss13","medbay") }, /obj/item/radio/intercom/directional/south, -/turf/open/floor/iron, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "nTT" = ( /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -44818,6 +44825,7 @@ /obj/machinery/camera/autoname/directional/south{ network = list("aicore") }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/catwalk_floor/iron_dark, /area/station/ai_monitored/turret_protected/ai) "pRq" = ( @@ -48146,6 +48154,7 @@ /obj/machinery/door/airlock/freezer{ name = "Freezer" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) "rbw" = ( @@ -50250,7 +50259,7 @@ dir = 8 }, /obj/machinery/duct, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "rIJ" = ( /obj/machinery/light/small/directional/south, @@ -51215,6 +51224,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/white, /area/station/medical/coldroom) "rYy" = ( @@ -53944,6 +53954,7 @@ /obj/machinery/door/airlock/freezer{ name = "Freezer" }, +/obj/structure/plasticflaps/kitchen, /turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/service/kitchen/coldroom) "sUM" = ( @@ -62369,7 +62380,7 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/duct, -/turf/open/floor/iron/showroomfloor, +/turf/open/floor/iron/kitchen_coldroom/freezerfloor, /area/station/medical/coldroom) "vTt" = ( /obj/structure/marker_beacon/burgundy, @@ -64316,7 +64327,7 @@ }, /obj/structure/closet/crate/freezer/blood, /obj/machinery/firealarm/directional/west, -/turf/open/floor/iron, +/turf/open/floor/iron/kitchen_coldroom, /area/station/medical/coldroom) "wDo" = ( /obj/structure/cable, diff --git a/code/game/objects/structures/plasticflaps.dm b/code/game/objects/structures/plasticflaps.dm index c4496e66610..09638e6d717 100644 --- a/code/game/objects/structures/plasticflaps.dm +++ b/code/game/objects/structures/plasticflaps.dm @@ -9,9 +9,17 @@ anchored = TRUE can_atmos_pass = ATMOS_PASS_NO can_astar_pass = CANASTARPASS_ALWAYS_PROC - -/obj/structure/plasticflaps/opaque - opacity = TRUE + integrity_failure = 0.75 + // This layer only matters for determining when you click it vs other objects + layer = BELOW_OPEN_DOOR_LAYER + /// If TRUE, we can't pass through unless the mob is resting (or fulfills more specific requirements) + var/require_resting = TRUE + /// Layer the flaps render on + var/flaps_layer = ABOVE_MOB_LAYER + /// Alpha of the flaps + var/flaps_alpha = 255 + /// Limits how much damage from environmental fire we can take per second + COOLDOWN_DECLARE(burn_damage_cd) /datum/armor/structure_plasticflaps melee = 100 @@ -22,22 +30,114 @@ fire = 50 acid = 50 +/obj/structure/plasticflaps/opaque + opacity = TRUE + +/obj/structure/plasticflaps/kitchen + name = "cold room plastic flaps" + desc = "Light and airtight plastic flaps made to keep the cold room cold and the warm room warm." + armor_type = /datum/armor/structure_plasticflaps/kitchen + require_resting = FALSE + flaps_alpha = 150 + +/datum/armor/structure_plasticflaps/kitchen + melee = 50 + fire = 20 + acid = 20 + /obj/structure/plasticflaps/Initialize(mapload) . = ..() alpha = 0 gen_overlay() air_update_turf(TRUE, TRUE) + var/static/list/loc_connections = list( + COMSIG_ATOM_EXITED = PROC_REF(play_plastic_sound), + ) + AddElement(/datum/element/connect_loc, loc_connections) + var/static/list/adjacent_loc_connections = list( + COMSIG_TURF_EXPOSE = PROC_REF(check_melt), + ) + AddComponent(/datum/component/connect_range, tracked = src, connections = adjacent_loc_connections, range = 1, works_in_containers = FALSE) + +/obj/structure/plasticflaps/proc/play_plastic_sound(obj/source, atom/movable/exiting) + SIGNAL_HANDLER + if(isitem(exiting)) + var/obj/item/item_exiter = exiting + if(item_exiter.w_class <= WEIGHT_CLASS_NORMAL) + return + if(item_exiter.item_flags & ABSTRACT) + return + if(isliving(exiting)) + var/mob/living/living_exiter = exiting + if(living_exiter.mob_size <= MOB_SIZE_TINY) + return + // you're crawling under them + if(living_exiter.body_position == LYING_DOWN) + return + if(living_exiter.incorporeal_move) + return + if(HAS_TRAIT(exiting, TRAIT_MAGICALLY_PHASED)) + return + if(locate(/obj/structure/plasticflaps) in exiting.loc) + return + playsound(src, 'sound/effects/plasticflaps.ogg', 50, TRUE, ignore_walls = FALSE, falloff_exponent = 8, extrarange = SHORT_RANGE_SOUND_EXTRARANGE) + +/obj/structure/plasticflaps/proc/check_melt(turf/source, datum/gas_mixture/air, temperature) + SIGNAL_HANDLER + if(temperature < FIRE_MINIMUM_TEMPERATURE_TO_EXIST) + return + if(!COOLDOWN_FINISHED(src, burn_damage_cd)) + return + + COOLDOWN_START(src, burn_damage_cd, 1 SECONDS) + + var/percent_damage_taken = clamp(0.2 * (temperature / (FIRE_MINIMUM_TEMPERATURE_TO_EXIST * 2.5)), 0.05, 0.25) + take_damage(max_integrity * percent_damage_taken, BURN, FIRE, sound_effect = FALSE) + +/obj/structure/plasticflaps/atom_break(damage_flag) + if(damage_flag == FIRE) + visible_message(span_warning("[src] start\s to melt from the heat!")) + return ..() + +/obj/structure/plasticflaps/atom_destruction(damage_flag) + if(damage_flag == FIRE) + visible_message(span_warning("[src] melt\s away into plastic goo!")) + return ..() /obj/structure/plasticflaps/on_changed_z_level(turf/old_turf, turf/new_turf, same_z_layer, notify_contents) - if(same_z_layer) - return ..() + if(!same_z_layer) + SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) + gen_overlay() + return ..() + +/obj/structure/plasticflaps/setDir(newdir) + . = ..() SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) gen_overlay() - return ..() /obj/structure/plasticflaps/proc/gen_overlay() var/turf/our_turf = get_turf(src) - SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, MUTATE_PLANE(GAME_PLANE, our_turf), dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it + //you see mobs under it, but you hit them like they are above it + SSvis_overlays.add_vis_overlay(src, icon, icon_state, + layer = flaps_layer, + plane = MUTATE_PLANE(GAME_PLANE, our_turf), + dir = dir, + alpha = flaps_alpha, + add_appearance_flags = RESET_ALPHA, + ) + +/obj/structure/plasticflaps/vv_edit_var(var_name, var_val) + . = ..() + var/list/relevant_vars = list( + NAMEOF(src, flaps_layer), + NAMEOF(src, flaps_alpha), + NAMEOF(src, dir), + NAMEOF(src, icon), + NAMEOF(src, icon_state), + ) + if(var_name in relevant_vars) + SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) + gen_overlay() /obj/structure/plasticflaps/examine(mob/user) . = ..() @@ -85,12 +185,15 @@ return TRUE /obj/structure/plasticflaps/CanAStarPass(to_dir, datum/can_pass_info/pass_info) + if(!require_resting) + return TRUE if(pass_info.is_living) if(pass_info.is_bot) return TRUE if(pass_info.can_ventcrawl && pass_info.mob_size != MOB_SIZE_TINY) return FALSE - + if(pass_info.pass_flags & PASSFLAPS) + return TRUE if(pass_info.pulling_info) return CanAStarPass(to_dir, pass_info.pulling_info) return TRUE //diseases, stings, etc can pass @@ -100,8 +203,10 @@ . = ..() if(mover.pass_flags & PASSFLAPS) //For anything specifically engineered to cross plastic flaps. return TRUE - if(mover.pass_flags & PASSGLASS) - return prob(60) + if((mover.pass_flags & PASSGLASS) && prob(60)) + return TRUE + if(!require_resting) + return TRUE if(istype(mover, /obj/structure/bed)) var/obj/structure/bed/bed_mover = mover @@ -124,6 +229,7 @@ if(living_mover.body_position == STANDING_UP && living_mover.mob_size != MOB_SIZE_TINY && !(HAS_TRAIT(living_mover, TRAIT_VENTCRAWLER_ALWAYS) || HAS_TRAIT(living_mover, TRAIT_VENTCRAWLER_NUDE))) return FALSE //If you're not laying down, or a small creature, or a ventcrawler, then no pass. + return . /obj/structure/plasticflaps/atom_deconstruct(disassembled = TRUE) new /obj/item/stack/sheet/plastic/five(loc) diff --git a/sound/attributions.txt b/sound/attributions.txt index 76670aede85..5fdc0e9f928 100644 --- a/sound/attributions.txt +++ b/sound/attributions.txt @@ -221,4 +221,6 @@ sound/items/dice_roll.ogg -- https://freesound.org/people/Crovic/sounds/661935/ sound/items/handling/materials/snow_drop.ogg and sound/items/handling/materials/snow_pick_up.ogg -- https://freesound.org/people/Vrymaa/sounds/775014/ by Vrymaa (CC0) -sound/items/hair-clippers.ogg -- https://freesound.org/people/VIPERSTRONG/sounds/655747/ -- by VIPERSTRONG (CC0) \ No newline at end of file +sound/items/hair-clippers.ogg -- https://freesound.org/people/VIPERSTRONG/sounds/655747/ -- by VIPERSTRONG (CC0) + +sound/effect/plasticflaps.ogg -- door_plastic_tapes.wav by estupe -- https://freesound.org/s/186357/ -- License: Creative Commons 0 diff --git a/sound/effects/plasticflaps.ogg b/sound/effects/plasticflaps.ogg new file mode 100644 index 00000000000..b34f1fbd66c Binary files /dev/null and b/sound/effects/plasticflaps.ogg differ