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 4f8ada811c7..2ec3419e74f 100644 Binary files a/icons/obj/signs/slim_location_signs.dmi and b/icons/obj/signs/slim_location_signs.dmi differ 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 a8d9934f2df..3b22a757b57 100644 --- a/maps/outreach/outreach-3.dmm +++ b/maps/outreach/outreach-3.dmm @@ -83,6 +83,25 @@ "am" = ( /turf/simulated/wall, /area/outreach/outpost/vacant/ground/swroom) +"an" = ( +/obj/effect/decal/cleanable/dirt, +/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/machinery/suit_cycler/emergency/prepared{ + locked = 0 + }, +/obj/effect/floor_decal/industrial/hatch/yellow, +/turf/simulated/floor/tiled/steel_grid, +/area/outreach/outpost/eva/gf/north) "ap" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -112,15 +131,43 @@ }, /turf/simulated/floor/plating, /area/outreach/outpost/maint/passage/ground/east/eva) +"as" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/suit_cycler/emergency/prepared{ + locked = 0 + }, +/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/effect/decal/cleanable/dirt, +/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{ + icon_state = "eshowers"; + dir = 1 + }, +/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 +177,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 +252,84 @@ /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, +/obj/machinery/alarm{ + icon_state = "alarm0"; + dir = 4 + }, +/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, +/obj/effect/floor_decal/industrial/hatch/yellow, +/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, +/obj/machinery/alarm{ + icon_state = "alarm0"; + dir = 4 + }, +/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{ @@ -230,8 +356,61 @@ 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" = ( +/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"; @@ -783,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" = ( @@ -817,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"; @@ -2050,25 +2238,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{ @@ -2193,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" = ( @@ -2339,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" = ( @@ -2569,29 +2743,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" @@ -2655,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"; @@ -2770,26 +2925,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 +3217,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 +3326,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"; @@ -3870,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" = ( @@ -4200,11 +4323,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 +4628,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"; @@ -4567,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" = ( @@ -4685,22 +4792,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{ @@ -5159,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" = ( @@ -5418,14 +5510,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, @@ -5795,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" = ( @@ -6261,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" = ( @@ -6549,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" = ( @@ -6609,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" = ( @@ -7509,15 +7600,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 +7749,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 +7799,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 +7872,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" @@ -7899,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" = ( @@ -30200,21 +30258,21 @@ sC Kc mZ Ku -aw +an +ao MQ MQ -MQ -Fy +aH by zR Ti vf Gj -ps -Li +aM Li Li -zi +as +av cS vP jD @@ -30403,7 +30461,7 @@ Cc mZ ul Eg -Yu +cC aK aQ hs @@ -30415,7 +30473,7 @@ PQ SG ka Nv -qk +me IC yQ vP @@ -30608,13 +30666,13 @@ Yu Eg bc if -ih +aJ by bB bW TZ Gj -AB +aO de Gk qk @@ -30806,21 +30864,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 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" = (