diff --git a/_maps/map_files/Blueshift/Blueshift.dmm b/_maps/map_files/Blueshift/Blueshift.dmm index f2400543936..3d2aa244f7c 100644 --- a/_maps/map_files/Blueshift/Blueshift.dmm +++ b/_maps/map_files/Blueshift/Blueshift.dmm @@ -19401,10 +19401,12 @@ /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 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "dHc" = ( @@ -25847,12 +25849,11 @@ /turf/open/floor/engine, /area/station/engineering/supermatter) "eSV" = ( -/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, -/obj/structure/reagent_dispensers/water_cooler/punch_cooler, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "eSY" = ( @@ -33054,13 +33055,9 @@ /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, +/turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "gnb" = ( /obj/effect/decal/cleanable/dirt{ @@ -38280,6 +38277,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" = ( @@ -42665,13 +42663,15 @@ /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 }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4 + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -63117,6 +63117,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" = ( @@ -74038,12 +74041,12 @@ /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 }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "ogR" = ( @@ -78354,21 +78357,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 @@ -89208,9 +89196,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 @@ -93322,6 +93307,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 4 + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -111949,6 +111937,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" = ( @@ -112747,6 +112738,9 @@ }, /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4 + }, /turf/open/floor/iron/white/side{ dir = 4 }, @@ -120075,11 +120069,9 @@ /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, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "wPg" = ( @@ -226470,7 +226462,7 @@ bCf bCf hHN hHN -oVV +ify rNd vxi rNd diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 41c479836c5..f6e9d1773a5 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -1742,7 +1742,8 @@ /obj/effect/turf_decal/tile/neutral/half/contrasted{ dir = 8 }, -/obj/structure/reagent_dispensers/water_cooler/punch_cooler, +/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" = ( @@ -5707,6 +5708,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "bXS" = ( @@ -15308,6 +15310,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "fgA" = ( @@ -20925,6 +20928,7 @@ /obj/effect/turf_decal/tile/neutral/anticorner/contrasted{ dir = 8 }, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/dark, /area/station/medical/medbay/lobby) "gOo" = ( @@ -40557,6 +40561,14 @@ }, /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, +/turf/open/floor/iron/showroomfloor, +/area/station/medical/medbay/lobby) "mWg" = ( /obj/effect/turf_decal/bot, /obj/structure/reagent_dispensers/watertank, @@ -57623,6 +57635,9 @@ dir = 4 }, /obj/effect/landmark/navigate_destination/med, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "sCr" = ( @@ -62274,6 +62289,9 @@ /obj/machinery/door/airlock/public/glass{ name = "Medbay" }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, /turf/open/floor/iron/dark, /area/station/hallway/primary/central/fore) "tWg" = ( @@ -74083,6 +74101,7 @@ /obj/effect/turf_decal/tile/blue{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/warning, /turf/open/floor/iron/showroomfloor, /area/station/medical/medbay/lobby) "xEB" = ( @@ -98583,7 +98602,7 @@ ciA krM xvW fXm -nes +mWc uTM eyA eIW diff --git a/_maps/map_files/VoidRaptor/VoidRaptor.dmm b/_maps/map_files/VoidRaptor/VoidRaptor.dmm index 6b407420b77..588140ae1e4 100644 --- a/_maps/map_files/VoidRaptor/VoidRaptor.dmm +++ b/_maps/map_files/VoidRaptor/VoidRaptor.dmm @@ -1160,6 +1160,7 @@ /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/punch, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -2106,6 +2107,9 @@ /area/station/security/armory) "aFv" = ( /obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "aFy" = ( @@ -25695,6 +25699,9 @@ }, /obj/structure/disposalpipe/segment, /obj/effect/landmark/navigate_destination/med, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "hxv" = ( @@ -27033,6 +27040,9 @@ dir = 4; name = "Arrivals" }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "hQF" = ( @@ -27339,6 +27349,7 @@ "hTP" = ( /obj/machinery/holopad, /obj/effect/turf_decal/bot, +/obj/effect/turf_decal/trimline/purple/warning, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "hTW" = ( @@ -32502,6 +32513,7 @@ /turf/open/floor/plating, /area/station/engineering/supermatter) "jrm" = ( +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "jrn" = ( @@ -34415,10 +34427,8 @@ /turf/open/floor/plating, /area/station/security/prison/garden) "jPU" = ( -/obj/effect/turf_decal/trimline/blue/filled/corner{ - dir = 8 - }, /obj/structure/disposalpipe/segment, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/white/smooth_corner{ dir = 8 }, @@ -35421,8 +35431,8 @@ }, /area/station/science/xenobiology) "kgj" = ( -/obj/effect/turf_decal/trimline/blue/filled/warning, /obj/effect/landmark/start/hangover, +/obj/effect/turf_decal/trimline/purple/warning, /turf/open/floor/iron/white/smooth_edge{ dir = 1 }, @@ -35636,6 +35646,7 @@ /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/warning, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "kiZ" = ( @@ -54890,15 +54901,16 @@ }, /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/purple/punch, +/obj/effect/turf_decal/trimline/blue/filled/line{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "ppf" = ( @@ -63212,11 +63224,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/effect/landmark/start/assistant, -/obj/structure/reagent_dispensers/water_cooler/punch_cooler, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, /turf/open/floor/iron/white/smooth_edge{ dir = 8 }, @@ -81468,6 +81479,13 @@ }, /turf/open/floor/iron/dark/smooth_large, /area/station/command/heads_quarters/cmo) +"wCC" = ( +/obj/machinery/door/firedoor, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, +/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, @@ -82004,6 +82022,13 @@ 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, +/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, @@ -118935,7 +118960,7 @@ dLw cnC uai xRC -sSx +wJU sSx sCj vHW @@ -120225,7 +120250,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 e1f800913b0..88a15d35ea2 100644 --- a/_maps/map_files/biodome/biodome.dmm +++ b/_maps/map_files/biodome/biodome.dmm @@ -6341,13 +6341,11 @@ /area/station/biodome/fore) "chZ" = ( /obj/machinery/light/directional/south, -/obj/effect/turf_decal/tile/blue{ - dir = 4 - }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, /obj/machinery/airalarm/directional/west, -/obj/structure/reagent_dispensers/water_cooler/punch_cooler, +/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" = ( @@ -15354,6 +15352,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "fky" = ( @@ -15674,6 +15673,7 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 8 }, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "frh" = ( @@ -18055,6 +18055,7 @@ dir = 8 }, /obj/effect/turf_decal/tile/neutral/fourcorners, +/obj/effect/turf_decal/trimline/purple/warning, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "gfL" = ( @@ -26575,6 +26576,7 @@ /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, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "jiG" = ( @@ -29641,6 +29643,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "kle" = ( @@ -32003,6 +32008,9 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "kYo" = ( @@ -39470,6 +39478,9 @@ "nwo" = ( /obj/machinery/door/firedoor, /obj/structure/cable, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 8 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "nwq" = ( @@ -60090,6 +60101,7 @@ /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, /turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "uAp" = ( @@ -60258,7 +60270,10 @@ /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 + }, +/turf/open/floor/iron/white/smooth_large, /area/station/medical/medbay/lobby) "uCX" = ( /obj/structure/chair/wood/wings{ @@ -64080,7 +64095,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/iron/white, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4 + }, +/turf/open/floor/iron/white/smooth_large, /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 c319b56060a..dc4889db79a 100644 --- a/_maps/map_files/moonstation/moonstation.dmm +++ b/_maps/map_files/moonstation/moonstation.dmm @@ -6170,6 +6170,13 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, /turf/open/floor/wood, /area/station/service/bar) +"bHQ" = ( +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/blue/filled/line, +/turf/open/floor/iron/white, +/area/station/medical/medbay/lobby) "bHS" = ( /obj/machinery/disposal/delivery_chute{ name = "crate deliveries" @@ -8423,11 +8430,11 @@ /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/item/radio/intercom/directional/east, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "coa" = ( @@ -9170,6 +9177,9 @@ /obj/effect/turf_decal/tile/blue/half/contrasted{ dir = 1 }, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "cAY" = ( @@ -13635,6 +13645,9 @@ dir = 4 }, /obj/machinery/self_actualization_device, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "dKl" = ( @@ -20204,9 +20217,6 @@ /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) "fvv" = ( @@ -32089,9 +32099,6 @@ /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) @@ -33153,9 +33160,6 @@ /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, @@ -33437,10 +33441,10 @@ /turf/open/floor/iron/white, /area/station/security/medical) "iXx" = ( -/obj/effect/turf_decal/tile/blue{ +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/effect/turf_decal/trimline/purple/punch{ dir = 4 }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "iXA" = ( @@ -38541,10 +38545,10 @@ /turf/open/floor/iron/dark, /area/station/security/armory) "kpS" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, +/obj/effect/turf_decal/trimline/purple/warning{ dir = 4 }, -/obj/machinery/atmospherics/components/unary/vent_pump/on/layer4, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "kqc" = ( @@ -38574,6 +38578,9 @@ /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) "kqj" = ( @@ -50919,7 +50926,9 @@ /turf/open/floor/plating, /area/station/maintenance/port/fore) "nFM" = ( -/obj/effect/turf_decal/tile/blue, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 4 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "nFN" = ( @@ -52280,6 +52289,9 @@ /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) "nYY" = ( @@ -55210,10 +55222,10 @@ /turf/open/floor/iron/large, /area/station/engineering/atmos/hallway) "oKG" = ( -/obj/effect/turf_decal/tile/blue/half/contrasted{ +/obj/effect/turf_decal/tile/purple/half/contrasted{ dir = 1 }, -/obj/structure/reagent_dispensers/water_cooler/punch_cooler, +/obj/structure/reagent_dispensers/water_cooler/punch_cooler/medical, /obj/machinery/firealarm/directional/north, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) @@ -58367,15 +58379,15 @@ /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 }, +/obj/effect/turf_decal/trimline/purple/punch{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "pAA" = ( @@ -76332,6 +76344,9 @@ }, /obj/machinery/power/apc/auto_name/directional/south, /obj/structure/cable, +/obj/effect/turf_decal/trimline/purple/warning{ + dir = 1 + }, /turf/open/floor/iron/white, /area/station/medical/medbay/lobby) "uri" = ( @@ -84605,10 +84620,10 @@ }, /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/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/white/side, /area/station/medical/medbay/lobby) "wGb" = ( @@ -84839,11 +84854,11 @@ }, /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, +/obj/effect/turf_decal/trimline/purple/punch, /turf/open/floor/iron/white/side, /area/station/medical/medbay/lobby) "wIV" = ( @@ -86904,6 +86919,18 @@ /obj/effect/turf_decal/delivery, /turf/open/floor/plating, /area/station/maintenance/port/aft) +"xmD" = ( +/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{ + dir = 1 + }, +/obj/effect/turf_decal/trimline/purple/warning, +/turf/open/floor/iron/white/side, +/area/station/medical/medbay/lobby) "xmM" = ( /obj/machinery/computer/message_monitor{ dir = 4 @@ -259005,12 +259032,12 @@ aOE vWS gzH xUZ -wFT +xmD vkg god mUk phq -cAp +bHQ sHH cLN qce 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/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/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 afdc4b0800d..8668b53cea3 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -9035,6 +9035,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" @@ -9627,6 +9628,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"