From d97e9415e29dc7d56efd79af6ef85dc662209177 Mon Sep 17 00:00:00 2001 From: PsyCommando Date: Tue, 9 Jan 2024 15:04:27 -0500 Subject: [PATCH 1/3] Add showers + medkits to EVA rooms * Removed a few suit cyclers in EVA and replaced them with decontamination showers. * Replaced some lockers in EVA with emergency stuff. --- maps/outreach/outreach-3.dmm | 370 ++++++++++++++++++----------------- 1 file changed, 192 insertions(+), 178 deletions(-) diff --git a/maps/outreach/outreach-3.dmm b/maps/outreach/outreach-3.dmm index a8d9934f2df..28a0f714e44 100644 --- a/maps/outreach/outreach-3.dmm +++ b/maps/outreach/outreach-3.dmm @@ -83,6 +83,27 @@ "am" = ( /turf/simulated/wall, /area/outreach/outpost/vacant/ground/swroom) +"an" = ( +/obj/machinery/alarm, +/obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/shower{ + icon_state = "shower"; + dir = 4 + }, +/obj/structure/hygiene/drain, +/obj/effect/floor_decal/industrial/hatch/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) +"ao" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/shower{ + icon_state = "shower"; + dir = 4 + }, +/obj/structure/hygiene/drain, +/obj/effect/floor_decal/industrial/hatch/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) "ap" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -112,15 +133,45 @@ }, /turf/simulated/floor/plating, /area/outreach/outpost/maint/passage/ground/east/eva) +"as" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, +/obj/structure/hygiene/shower{ + icon_state = "shower"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) "at" = ( /turf/simulated/wall, /area/outreach/outpost/maint/passage/ground/east/eva) +"av" = ( +/obj/machinery/alarm{ + icon_state = "alarm0"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, +/obj/structure/hygiene/shower{ + icon_state = "shower"; + dir = 4 + }, +/obj/effect/floor_decal/industrial/hatch/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) "aw" = ( -/obj/machinery/alarm, -/obj/machinery/suit_cycler/emergency/prepared{ - locked = 0 +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 1 + }, +/obj/machinery/atmospherics/portables_connector{ + icon_state = "map_connector"; + dir = 4 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/blue, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "ax" = ( @@ -130,6 +181,20 @@ }, /turf/simulated/floor/tiled/steel_ridged/airless, /area/outreach/outpost/storage_shed/gf/north) +"ay" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) +"az" = ( +/obj/item/radio/intercom{ + icon_state = "intercom"; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/internals, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) "aA" = ( /obj/machinery/atmospherics/pipe/simple/visible/cyan{ icon_state = "11"; @@ -191,19 +256,75 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/maint/power/ground) +"aH" = ( +/obj/machinery/light/small, +/obj/effect/decal/cleanable/dirt, +/obj/structure/rack/dark, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) "aI" = ( /obj/machinery/light/small, /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/techfloor/airless, /area/outreach/outpost/storage_shed/gf/north) +"aJ" = ( +/obj/machinery/light_switch{ + icon_state = "light0"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) "aK" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) +"aL" = ( +/obj/machinery/power/apc{ + icon_state = "apc0"; + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/structure/rack/dark, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/mask/gas/budget, +/obj/item/clothing/mask/gas/budget, +/obj/item/clothing/mask/gas/budget, +/obj/item/clothing/mask/gas/budget, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) +"aM" = ( +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 1 + }, +/obj/effect/decal/cleanable/dirt, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, +/obj/structure/rack/dark, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) "aN" = ( /turf/exterior/concrete, /area/exoplanet/outreach) +"aO" = ( +/obj/machinery/light_switch, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) "aP" = ( /obj/effect/floor_decal/industrial/warning, /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ @@ -232,6 +353,58 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) +"aR" = ( +/obj/machinery/atmospherics/pipe/simple/hidden, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + icon_state = "apc0"; + dir = 4 + }, +/obj/structure/rack/dark, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/item/tank/emergency/oxygen/double, +/obj/effect/decal/cleanable/dirt, +/obj/item/clothing/mask/gas/budget, +/obj/item/clothing/mask/gas/budget, +/obj/item/clothing/mask/gas/budget, +/obj/item/clothing/mask/gas/budget, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) +"aS" = ( +/obj/item/radio/intercom{ + icon_state = "intercom"; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/crate/internals, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) +"aT" = ( +/obj/effect/decal/cleanable/dirt, +/obj/structure/closet/emcloset, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) +"aU" = ( +/obj/machinery/light/small, +/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/machinery/atmospherics/portables_connector{ + icon_state = "map_connector"; + dir = 4 + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/outline/blue, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) "aV" = ( /obj/machinery/door/airlock/hatch/maintenance{ icon_state = "closed"; @@ -2050,25 +2223,6 @@ /obj/effect/catwalk_plated, /turf/simulated/floor/plating, /area/outreach/outpost/hallway/south/ground/business_wing) -"ih" = ( -/obj/machinery/light_switch{ - icon_state = "light0"; - dir = 1 - }, -/obj/structure/rack/dark, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/north) "ii" = ( /obj/effect/floor_decal/industrial/warning/fulltile, /obj/machinery/door/blast/shutters/open{ @@ -2569,29 +2723,6 @@ /obj/effect/catwalk_plated/dark, /turf/simulated/floor/plating/outreach, /area/exoplanet/outreach) -"lF" = ( -/obj/machinery/atmospherics/pipe/simple/hidden, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/obj/machinery/power/apc{ - icon_state = "apc0"; - dir = 4 - }, -/obj/structure/rack/dark, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "lH" = ( /obj/structure/cable/yellow{ icon_state = "16-0" @@ -2770,26 +2901,6 @@ "mZ" = ( /turf/simulated/wall, /area/outreach/outpost/maint/passage/ground/north/hangar) -"nb" = ( -/obj/machinery/power/apc{ - icon_state = "apc0"; - dir = 4 - }, -/obj/structure/cable/yellow, -/obj/structure/rack/dark, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/item/tank/emergency/oxygen/double, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/north) "nc" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/plating, @@ -3082,17 +3193,6 @@ "pp" = ( /turf/simulated/wall/ocp_wall/prepainted, /area/outreach/outpost/maint/passage/ground/north/hangar) -"ps" = ( -/obj/machinery/light/small{ - icon_state = "bulb_map"; - dir = 1 - }, -/obj/machinery/suit_cycler/emergency/prepared{ - locked = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "pt" = ( /turf/simulated/wall, /area/outreach/outpost/stairwell/ground) @@ -3202,11 +3302,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/reinforced/airless, /area/exoplanet/outreach) -"pV" = ( -/obj/structure/closet, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/north) "qd" = ( /obj/effect/floor_decal/industrial/warning/dust{ icon_state = "warning_dust"; @@ -4200,11 +4295,6 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/plating, /area/outreach/outpost/vacant/ground/office4) -"xw" = ( -/obj/structure/closet, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "xy" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -4510,17 +4600,6 @@ }, /turf/simulated/floor/plating, /area/outreach/outpost/maint/passage/ground/north/hangar) -"zi" = ( -/obj/machinery/alarm{ - icon_state = "alarm0"; - dir = 1 - }, -/obj/machinery/suit_cycler/emergency/prepared{ - locked = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "zp" = ( /obj/effect/floor_decal/industrial/warning/dust/corner{ icon_state = "warningcorner_dust"; @@ -4685,22 +4764,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating, /area/outreach/outpost/maint/passage/ground/east/airlock) -"AB" = ( -/obj/machinery/light_switch, -/obj/structure/rack/dark, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/item/clothing/mask/gas/budget, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "AE" = ( /obj/structure/stairs/long, /obj/structure/railing/mapped/stairwell{ @@ -5418,14 +5481,6 @@ /obj/effect/catwalk_plated/dark, /turf/simulated/floor/plating/outreach, /area/exoplanet/outreach) -"Fy" = ( -/obj/machinery/light/small, -/obj/machinery/suit_cycler/emergency/prepared{ - locked = 0 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/north) "Fz" = ( /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/reinforced/airless, @@ -7509,15 +7564,6 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/plating, /area/outreach/outpost/maint/atmos/ground) -"TR" = ( -/obj/item/radio/intercom{ - icon_state = "intercom"; - dir = 8 - }, -/obj/structure/closet, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/north) "TS" = ( /obj/effect/floor_decal/corner/grey/bordercorner{ icon_state = "bordercolorcorner"; @@ -7667,19 +7713,6 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/maint/storage/ground) -"UN" = ( -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/light/small{ - icon_state = "bulb_map"; - dir = 1 - }, -/obj/machinery/atmospherics/portables_connector{ - icon_state = "map_connector"; - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/north) "UO" = ( /obj/machinery/light/small{ icon_state = "bulb_map"; @@ -7730,16 +7763,6 @@ }, /turf/simulated/floor/reinforced/airless, /area/exoplanet/outreach) -"Vd" = ( -/obj/machinery/light/small, -/obj/machinery/portable_atmospherics/canister/oxygen, -/obj/machinery/atmospherics/portables_connector{ - icon_state = "map_connector"; - dir = 4 - }, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "Ve" = ( /obj/machinery/door/firedoor/autoset, /obj/effect/wallframe_spawn/concrete, @@ -7813,15 +7836,6 @@ /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/tiled/steel_ridged/outreach, /area/exoplanet/outreach) -"VR" = ( -/obj/item/radio/intercom{ - icon_state = "intercom"; - dir = 8 - }, -/obj/structure/closet, -/obj/effect/decal/cleanable/dirt, -/turf/simulated/floor/tiled/steel_grid, -/area/outreach/outpost/eva/gf/south) "VV" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -30200,21 +30214,21 @@ sC Kc mZ Ku -aw -MQ +an +ao MQ MQ -Fy +aH by zR Ti vf Gj -ps +aM Li Li -Li -zi +as +av cS vP jD @@ -30608,13 +30622,13 @@ Yu Eg bc if -ih +aJ by bB bW TZ Gj -AB +aO de Gk qk @@ -30806,21 +30820,21 @@ sC MD mZ Ku -UN -pV -TR +aw +ay +az uo -nb +aL Ve DF bW UK cT -lF +aR yJ -VR -xw -Vd +aS +aT +aU cS vP xS From 2ebe18c5e426c082f6e9d8af10ad36d3e62ea83f Mon Sep 17 00:00:00 2001 From: PsyCommando Date: Tue, 9 Jan 2024 17:47:10 -0500 Subject: [PATCH 2/3] Added emergency showers * Tweaked shower code a bit to prevent the eshower from being used as any other showers. * Added a shower variant for emergency decontamination showers, like those used in labs. Gave it sliightly increased flow and drain ability. * Added a new directional icon for the eshower I drew myself. * Added emergency shower sign. * Added an icon for the emergency shower sign that I drew myself. --- .../structures/signs/direction_signs.dm | 11 +++- code/game/objects/structures/watercloset.dm | 58 +++++++++++++----- icons/obj/signs/slim_location_signs.dmi | Bin 5293 -> 5596 bytes 3 files changed, 51 insertions(+), 18 deletions(-) diff --git a/code/game/objects/structures/signs/direction_signs.dm b/code/game/objects/structures/signs/direction_signs.dm index 77b10cf104c..6a4ce87f243 100644 --- a/code/game/objects/structures/signs/direction_signs.dm +++ b/code/game/objects/structures/signs/direction_signs.dm @@ -117,4 +117,13 @@ /obj/structure/sign/deck/fifth name = "\improper Fifth Deck" - icon_state = "deck-5" \ No newline at end of file + icon_state = "deck-5" + +///////////////////////////////////////////////////// +// Misc Signs Definition +///////////////////////////////////////////////////// + +/obj/structure/sign/eshowers + name = "\improper EMERGENCY SHOWERS" + icon = 'icons/obj/signs/slim_location_signs.dmi' + icon_state = "eshowers" diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm index 1c466ff083d..20c6a5f7489 100644 --- a/code/game/objects/structures/watercloset.dm +++ b/code/game/objects/structures/watercloset.dm @@ -8,7 +8,7 @@ var/global/list/hygiene_props = list() var/drainage = 0.5 var/last_gurgle = 0 -/obj/structure/hygiene/Initialize() +/obj/structure/hygiene/Initialize(ml, _mat, _reinf_mat) . = ..() global.hygiene_props += src START_PROCESSING(SSobj, src) @@ -239,15 +239,17 @@ var/global/list/hygiene_props = list() var/next_wash = 0 var/watertemp = "normal" //freezing, normal, or boiling var/list/temperature_settings = list("normal" = 310, "boiling" = T0C+100, "freezing" = T0C) + ///The amount of internal reagent storage. Essentially the volume of fluid the shower dispenses each tick. + var/internal_volume = 5 var/sound_id = /obj/structure/hygiene/shower var/datum/sound_token/sound_token //add heat controls? when emagged, you can freeze to death in it? -/obj/structure/hygiene/shower/Initialize() +/obj/structure/hygiene/shower/Initialize(ml, _mat, _reinf_mat) . = ..() - create_reagents(5) + create_reagents(internal_volume) /obj/structure/hygiene/shower/Destroy() QDEL_NULL(sound_token) @@ -281,7 +283,7 @@ var/global/list/hygiene_props = list() anchored = TRUE mouse_opacity = MOUSE_OPACITY_UNCLICKABLE -/obj/effect/mist/Initialize() +/obj/effect/mist/Initialize(mapload) . = ..() if(. != INITIALIZE_HINT_QDEL) addtimer(CALLBACK(src, /datum/proc/qdel_self), 25 SECONDS) @@ -290,20 +292,30 @@ var/global/list/hygiene_props = list() if(istype(I, /obj/item/scanner/gas)) to_chat(user, SPAN_NOTICE("The water temperature seems to be [watertemp].")) return + . = ..() - if(IS_WRENCH(I)) - var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings - if(newtemp != watertemp && !QDELETED(I) && !QDELETED(user) && !QDELETED(src) && user.Adjacent(src) && I.loc == src) - to_chat(user, SPAN_NOTICE("You begin to adjust the temperature valve with \the [I].")) - playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) - if(do_after(user, (5 SECONDS), src) && newtemp != watertemp) - watertemp = newtemp - user.visible_message( - SPAN_NOTICE("\The [user] adjusts \the [src] with \the [I]."), - SPAN_NOTICE("You adjust the shower with \the [I].")) - add_fingerprint(user) +/obj/structure/hygiene/shower/handle_default_wrench_attackby(mob/user, obj/item/wrench) + if(length(temperature_settings) <= 1) + return FALSE //If no options, don't do anything. + var/newtemp = input(user, "What setting would you like to set the temperature valve to?", "Water Temperature Valve") in temperature_settings + + //Sanity check after the user closes the input dialog. + if(QDELETED(wrench) || QDELETED(user) || QDELETED(src)) + return TRUE + if(!CanPhysicallyInteractWith(user, src) || !wrench.CanUseTopic(user, global.inventory_topic_state)) + return TRUE + if(newtemp == watertemp) return TRUE - . = ..() + + to_chat(user, SPAN_NOTICE("You begin to adjust the temperature valve with \the [wrench].")) + playsound(src.loc, 'sound/items/Ratchet.ogg', 50, 1) + if(do_after(user, (5 SECONDS), src) && newtemp != watertemp) + watertemp = newtemp + user.visible_message( + SPAN_NOTICE("\The [user] adjusts \the [src] with \the [wrench]."), + SPAN_NOTICE("You adjust the shower with \the [wrench].")) + add_fingerprint(user) + return TRUE /obj/structure/hygiene/shower/on_update_icon() ..() @@ -316,7 +328,7 @@ var/global/list/hygiene_props = list() next_mist = world.time + (25 SECONDS) /obj/structure/hygiene/shower/Process() - ..() + . = ..() if(on) update_mist() for(var/thing in loc.get_contained_external_atoms()) @@ -340,6 +352,18 @@ var/global/list/hygiene_props = list() else if(water_temperature <= H.get_temperature_threshold(COLD_LEVEL_1)) to_chat(H, SPAN_DANGER("The water is freezing cold!")) +/obj/structure/hygiene/shower/emergency + name = "emergency shower" + desc = "An emergency decontamination shower." + color = PIPE_COLOR_YELLOW + icon_state = "eshower" + internal_volume = 8 + drainage = 0.8 + temperature_settings = list("normal" = T20C) //Room/pipe temperature, but since the whole thing is hardcoded, set to 20c + +/obj/structure/hygiene/shower/emergency/handle_default_wrench_attackby(mob/user, obj/item/wrench) + return FALSE //Can't change the temperature + /obj/item/bikehorn/rubberducky name = "rubber ducky" desc = "Rubber ducky you're so fine, you make bathtime lots of fuuun. Rubber ducky I'm awfully fooooond of yooooouuuu~" //thanks doohl diff --git a/icons/obj/signs/slim_location_signs.dmi b/icons/obj/signs/slim_location_signs.dmi index 4f8ada811c7452f9c16fab530f286e0d83c11b53..2ec3419e74f5c5c976b43f5b42348c386aa9b1f2 100644 GIT binary patch delta 5440 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¨mAvgp-CxScWc)pN68_ueeIu8FS1=j>jf?+w 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 From b65c38909c5901a1e155b35d67a916f45504fd15 Mon Sep 17 00:00:00 2001 From: PsyCommando Date: Tue, 9 Jan 2024 18:02:06 -0500 Subject: [PATCH 3/3] Added emergency showers to outreach map Added an emergency shower to all airlocks, and to the 2 eva rooms. --- maps/outreach/outreach-1.dmm | 19 ++++--- maps/outreach/outreach-2.dmm | 42 ++++++++++++---- maps/outreach/outreach-3.dmm | 96 ++++++++++++++++++++++++++---------- maps/outreach/outreach-4.dmm | 19 ++++++- 4 files changed, 132 insertions(+), 44 deletions(-) diff --git a/maps/outreach/outreach-1.dmm b/maps/outreach/outreach-1.dmm index 7363eb12471..3ef9b732e62 100644 --- a/maps/outreach/outreach-1.dmm +++ b/maps/outreach/outreach-1.dmm @@ -2112,17 +2112,13 @@ /obj/structure/cable/yellow{ icon_state = "4-8" }, -/obj/structure/sign/warning/airlock{ - pixel_y = 32 - }, -/obj/machinery/light/small{ - icon_state = "bulb_map"; - dir = 1 - }, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 8; id_tag = "OH_l1_e_alck_pump" }, +/obj/structure/sign/eshowers, +/obj/structure/hygiene/shower/emergency, +/obj/effect/floor_decal/industrial/hatch/blue, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement2) "eG" = ( @@ -2351,6 +2347,10 @@ dir = 1; id_tag = "OH_l1_e_alck_pump" }, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement2) "fe" = ( @@ -2587,6 +2587,10 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ id_tag = "OH_l1_e_alck_pump_out_internal" }, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement2) "fC" = ( @@ -2925,6 +2929,7 @@ /area/outreach/outpost/hallway/south/basement2) "gg" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement2) "gh" = ( diff --git a/maps/outreach/outreach-2.dmm b/maps/outreach/outreach-2.dmm index 5068aef209b..02a0d935fac 100644 --- a/maps/outreach/outreach-2.dmm +++ b/maps/outreach/outreach-2.dmm @@ -1972,6 +1972,7 @@ /area/outreach/outpost/airlock/basement1/north) "er" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/north) "es" = ( @@ -5389,6 +5390,7 @@ /area/exoplanet/outreach/underground/d1) "ll" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/south) "lm" = ( @@ -5917,9 +5919,14 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ id_tag = "OH_l2_n_alck_pump" }, -/obj/machinery/light/small/red{ - icon_state = "bulb_map"; - dir = 4 +/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/hygiene/shower/emergency{ + icon_state = "eshower"; + dir = 8 + }, +/obj/structure/sign/eshowers{ + icon_state = "eshowers"; + dir = 8 }, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/north) @@ -6051,6 +6058,10 @@ /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ id_tag = "OH_l2_s_alck_pump_out_internal" }, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 4 + }, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/south) "mu" = ( @@ -6432,6 +6443,7 @@ /area/outreach/outpost/airlock/basement1/west) "nd" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/east) "ne" = ( @@ -6543,10 +6555,9 @@ dir = 8; id_tag = "OH_l2_e_alck_pump" }, -/obj/machinery/light/small/red{ - icon_state = "bulb_map"; - dir = 1 - }, +/obj/structure/sign/eshowers, +/obj/structure/hygiene/shower/emergency, +/obj/effect/floor_decal/industrial/hatch/blue, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/east) "np" = ( @@ -6574,6 +6585,10 @@ icon_state = "map_vent"; id_tag = "OH_l2_n_alck_pump_out_internal" }, +/obj/machinery/light/small/red{ + icon_state = "bulb_map"; + dir = 8 + }, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/north) "nr" = ( @@ -6648,10 +6663,16 @@ icon_state = "map_vent"; id_tag = "OH_l2_s_alck_pump" }, -/obj/machinery/light/small{ - icon_state = "bulb_map"; - dir = 8 +/obj/structure/sign/eshowers{ + icon_state = "eshowers"; + dir = 4 }, +/obj/structure/hygiene/shower/emergency{ + color = "#c9a344"; + dir = 4; + icon_state = "eshower" + }, +/obj/effect/floor_decal/industrial/hatch/blue, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/south) "ny" = ( @@ -12021,6 +12042,7 @@ dir = 4; id_tag = "OH_l2_e_alck_pump_out_internal" }, +/obj/machinery/light/small/red, /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/airlock/basement1/east) "wZ" = ( diff --git a/maps/outreach/outreach-3.dmm b/maps/outreach/outreach-3.dmm index 28a0f714e44..3b22a757b57 100644 --- a/maps/outreach/outreach-3.dmm +++ b/maps/outreach/outreach-3.dmm @@ -84,24 +84,22 @@ /turf/simulated/wall, /area/outreach/outpost/vacant/ground/swroom) "an" = ( -/obj/machinery/alarm, /obj/effect/decal/cleanable/dirt, -/obj/structure/hygiene/shower{ - icon_state = "shower"; - dir = 4 - }, /obj/structure/hygiene/drain, /obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/hygiene/shower/emergency{ + icon_state = "eshower"; + dir = 4 + }, +/obj/structure/sign/eshowers, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "ao" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/hygiene/shower{ - icon_state = "shower"; - dir = 4 +/obj/machinery/suit_cycler/emergency/prepared{ + locked = 0 }, -/obj/structure/hygiene/drain, -/obj/effect/floor_decal/industrial/hatch/blue, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "ap" = ( @@ -135,29 +133,27 @@ /area/outreach/outpost/maint/passage/ground/east/eva) "as" = ( /obj/effect/decal/cleanable/dirt, -/obj/structure/hygiene/drain, -/obj/structure/hygiene/shower{ - icon_state = "shower"; - dir = 4 +/obj/machinery/suit_cycler/emergency/prepared{ + locked = 0 }, -/obj/effect/floor_decal/industrial/hatch/blue, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/south) "at" = ( /turf/simulated/wall, /area/outreach/outpost/maint/passage/ground/east/eva) "av" = ( -/obj/machinery/alarm{ - icon_state = "alarm0"; - dir = 1 - }, /obj/effect/decal/cleanable/dirt, /obj/structure/hygiene/drain, -/obj/structure/hygiene/shower{ - icon_state = "shower"; +/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/hygiene/shower/emergency{ + icon_state = "eshower"; dir = 4 }, -/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/sign/eshowers{ + icon_state = "eshowers"; + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/south) "aw" = ( @@ -262,6 +258,10 @@ /obj/structure/rack/dark, /obj/item/storage/firstaid/toxin, /obj/item/storage/firstaid/o2, +/obj/machinery/alarm{ + icon_state = "alarm0"; + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "aI" = ( @@ -280,6 +280,7 @@ /area/outreach/outpost/eva/gf/north) "aK" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "aL" = ( @@ -315,6 +316,10 @@ /obj/item/storage/firstaid/o2, /obj/item/storage/firstaid/toxin, /obj/structure/rack/dark, +/obj/machinery/alarm{ + icon_state = "alarm0"; + dir = 4 + }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/south) "aN" = ( @@ -351,6 +356,7 @@ icon_state = "map-supply"; dir = 8 }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "aR" = ( @@ -956,6 +962,10 @@ icon_state = "11-supply"; dir = 9 }, +/obj/machinery/alarm{ + icon_state = "alarm0"; + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/hallway/east/ground) "cq" = ( @@ -990,6 +1000,11 @@ "cB" = ( /turf/simulated/wall/concrete, /area/outreach/outpost/maint/power/ground) +"cC" = ( +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) "cE" = ( /obj/machinery/light_switch{ icon_state = "light0"; @@ -2347,6 +2362,10 @@ id_tag = "OH_l3_e_alck_pump" }, /obj/effect/decal/cleanable/dirt, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 8 + }, /turf/simulated/floor/reinforced, /area/outreach/outpost/airlock/ground) "je" = ( @@ -2493,6 +2512,7 @@ icon_state = "map-supply"; dir = 8 }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/south) "kh" = ( @@ -2786,6 +2806,10 @@ "mb" = ( /turf/exterior/water/outreach, /area/exoplanet/outreach) +"me" = ( +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/south) "mh" = ( /obj/effect/floor_decal/industrial/warning{ icon_state = "stripe"; @@ -3965,6 +3989,10 @@ icon_state = "map_vent_out"; dir = 1 }, +/obj/structure/sign/eshowers{ + icon_state = "eshowers"; + dir = 1 + }, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/hallway/east/ground) "vi" = ( @@ -4646,7 +4674,7 @@ /area/outreach/outpost/airlock/ground) "zR" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm, +/obj/structure/sign/eshowers, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/hallway/east/ground) "zT" = ( @@ -5222,6 +5250,7 @@ /area/exoplanet/outreach) "DS" = ( /obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, /turf/simulated/floor/reinforced, /area/outreach/outpost/airlock/ground) "DV" = ( @@ -5850,6 +5879,10 @@ dir = 1; id_tag = "OH_l3_e_alck_pump_out_internal" }, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 4 + }, /turf/simulated/floor/reinforced, /area/outreach/outpost/airlock/ground) "Ii" = ( @@ -6316,6 +6349,7 @@ locked = 0 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/south) "Lj" = ( @@ -6604,6 +6638,7 @@ locked = 0 }, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/north) "MU" = ( @@ -6664,6 +6699,7 @@ icon_state = "map_vent_out"; dir = 1 }, +/obj/effect/floor_decal/industrial/hatch/yellow, /turf/simulated/floor/tiled/steel_grid, /area/outreach/outpost/eva/gf/south) "Ny" = ( @@ -7913,11 +7949,19 @@ /turf/simulated/floor/reinforced/airless, /area/exoplanet/outreach) "Ws" = ( -/obj/machinery/light/small, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 8; id_tag = "OH_l3_e_alck_pump" }, +/obj/structure/hygiene/shower/emergency{ + icon_state = "eshower"; + dir = 1 + }, +/obj/structure/sign/eshowers{ + icon_state = "eshowers"; + dir = 1 + }, +/obj/effect/floor_decal/industrial/hatch/blue, /turf/simulated/floor/reinforced, /area/outreach/outpost/airlock/ground) "Wv" = ( @@ -30417,7 +30461,7 @@ Cc mZ ul Eg -Yu +cC aK aQ hs @@ -30429,7 +30473,7 @@ PQ SG ka Nv -qk +me IC yQ vP diff --git a/maps/outreach/outreach-4.dmm b/maps/outreach/outreach-4.dmm index d630fa0bfc7..51fc65971c3 100644 --- a/maps/outreach/outreach-4.dmm +++ b/maps/outreach/outreach-4.dmm @@ -231,6 +231,10 @@ icon_state = "map_vent"; id_tag = "OH_l4_e_alck_pump_out_internal" }, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 4 + }, /turf/simulated/floor/tiled/techfloor, /area/outreach/outpost/airlock/floor1) "bj" = ( @@ -423,6 +427,7 @@ icon_state = "4-8" }, /obj/effect/decal/cleanable/dirt, +/obj/structure/hygiene/drain, /turf/simulated/floor/tiled/techfloor, /area/outreach/outpost/airlock/floor1) "bB" = ( @@ -1358,6 +1363,10 @@ id_tag = "OH_l4_e_alck_pump" }, /obj/structure/cable/white, +/obj/machinery/light/small{ + icon_state = "bulb_map"; + dir = 8 + }, /turf/simulated/floor/tiled/techfloor, /area/outreach/outpost/airlock/floor1) "rd" = ( @@ -2806,13 +2815,21 @@ /turf/simulated/floor/tiled/techmaint, /area/outreach/outpost/maint/power/f1) "PM" = ( -/obj/machinery/light/small, /obj/machinery/atmospherics/unary/vent_pump/high_volume/airlock{ dir = 1; icon_state = "map_vent"; id_tag = "OH_l4_e_alck_pump_out_internal" }, /obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/industrial/hatch/blue, +/obj/structure/hygiene/shower/emergency{ + icon_state = "eshower"; + dir = 1 + }, +/obj/structure/sign/eshowers{ + icon_state = "eshowers"; + dir = 1 + }, /turf/simulated/floor/tiled/techfloor, /area/outreach/outpost/airlock/floor1) "PV" = (