diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index b39e8513bf..5962f9aa8f 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -69,11 +69,15 @@ ..() /obj/machinery/computer/message_monitor/Initialize() + ..() + return INITIALIZE_HINT_LATELOAD + +/obj/machinery/computer/message_monitor/LateInitialize() + . = ..() //Is the server isn't linked to a server, and there's a server available, default it to the first one in the list. if(!linkedServer) if(message_servers && message_servers.len > 0) linkedServer = message_servers[1] - return ..() /obj/machinery/computer/message_monitor/tgui_interact(mob/user, datum/tgui/ui) ui = SStgui.try_update_ui(user, src, ui) diff --git a/code/modules/holodeck/HolodeckControl.dm b/code/modules/holodeck/HolodeckControl.dm index 619792719f..0031720671 100644 --- a/code/modules/holodeck/HolodeckControl.dm +++ b/code/modules/holodeck/HolodeckControl.dm @@ -67,13 +67,13 @@ "Gym" = new/datum/holodeck_program(/area/holodeck/source_gym), //VOREStation add "Game Room" = new/datum/holodeck_program(/area/holodeck/source_game_room), //VOREStation add "Patient Ward" = new/datum/holodeck_program(/area/holodeck/source_patient_ward), //VOREStation add + "Inside" = new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add "Turn Off" = new/datum/holodeck_program(/area/holodeck/source_plating, list()) ) var/list/restricted_programs = list( "Burnoff Test Simulation" = new/datum/holodeck_program(/area/holodeck/source_burntest, list()), - "Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()), - "Inside" = new/datum/holodeck_program(/area/holodeck/the_uwu_zone, list('sound/vore/sunesound/prey/loop.ogg')), //VOREStation add + "Wildlife Simulation" = new/datum/holodeck_program(/area/holodeck/source_wildlife, list()) ) /obj/machinery/computer/HolodeckControl/attack_ai(var/mob/user as mob) diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index 9d3b6753ac..51529e04db 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -584,7 +584,7 @@ to_chat(src, "You feel your face burning and a searing heat in your lungs!") if(breath.temperature >= species.heat_discomfort_level) - + if(breath.temperature >= species.breath_heat_level_3) apply_damage(HEAT_GAS_DAMAGE_LEVEL_3, BURN, BP_HEAD, used_weapon = "Excessive Heat") throw_alert("temp", /obj/screen/alert/hot, HOT_ALERT_SEVERITY_MAX) @@ -1408,12 +1408,10 @@ if(istype(rig) && rig.visor && !looking_elsewhere) if(!rig.helmet || (head && rig.helmet == head)) if(rig.visor && rig.visor.vision && rig.visor.active && rig.visor.vision.glasses) - glasses_processed = 1 - process_glasses(rig.visor.vision.glasses) + glasses_processed = process_glasses(rig.visor.vision.glasses) if(glasses && !glasses_processed && !looking_elsewhere) - glasses_processed = 1 - process_glasses(glasses) + glasses_processed = process_glasses(glasses) if(XRAY in mutations) sight |= SEE_TURFS|SEE_MOBS|SEE_OBJS see_in_dark = 8 @@ -1423,6 +1421,15 @@ if(!isnull(M.vision_flags)) sight |= M.vision_flags + if(!glasses_processed && nif) + var/datum/nifsoft/vision_soft + for(var/datum/nifsoft/NS in nif.nifsofts) + if(NS.vision_exclusive && NS.active) + vision_soft = NS + break + if(vision_soft) + glasses_processed = process_nifsoft_vision(vision_soft) //not really glasses but equitable + if(!glasses_processed && (species.get_vision_flags(src) > 0)) sight |= species.get_vision_flags(src) if(!seer && !glasses_processed && seedarkness) @@ -1451,20 +1458,35 @@ return 1 /mob/living/carbon/human/proc/process_glasses(var/obj/item/clothing/glasses/G) + . = FALSE if(G && G.active) - see_in_dark += G.darkness_view + if(G.darkness_view) + see_in_dark += G.darkness_view + . = TRUE if(G.overlay && client) client.screen |= G.overlay if(G.vision_flags) sight |= G.vision_flags + . = TRUE if(istype(G,/obj/item/clothing/glasses/night) && !seer) see_invisible = SEE_INVISIBLE_MINIMUM if(G.see_invisible >= 0) see_invisible = G.see_invisible + . = TRUE else if(!druggy && !seer) see_invisible = see_invisible_default +/mob/living/carbon/human/proc/process_nifsoft_vision(var/datum/nifsoft/NS) + . = FALSE + if(NS && NS.active) + if(NS.darkness_view) + see_in_dark += NS.darkness_view + . = TRUE + if(NS.vision_flags_mob) + sight |= NS.vision_flags_mob + . = TRUE + /mob/living/carbon/human/handle_random_events() if(inStasisNow()) return diff --git a/code/modules/nifsoft/nifsoft.dm b/code/modules/nifsoft/nifsoft.dm index 81a9944383..ad1af357f1 100644 --- a/code/modules/nifsoft/nifsoft.dm +++ b/code/modules/nifsoft/nifsoft.dm @@ -35,8 +35,13 @@ var/combat_flags = 0 // Otherwise use set_flag/clear_flag in one of your own procs for tricks var/other_flags = 0 + var/vision_flags_mob = 0 + var/darkness_view = 0 + var/list/planes_enabled = null // List of vision planes this nifsoft enables when active + var/vision_exclusive = FALSE //Whether or not this NIFSoft provides exclusive vision modifier + var/list/incompatible_with = null // List of NIFSofts that are disabled when this one is enabled //Constructor accepts the NIF it's being loaded into @@ -99,6 +104,11 @@ nif.set_flag(combat_flags,NIF_FLAGS_COMBAT) nif.set_flag(other_flags,NIF_FLAGS_OTHER) + if(vision_exclusive) + var/mob/living/carbon/human/H = nif.human + if(H && istype(H)) + H.recalculate_vis() + return nif_result //Called when attempting to deactivate an implant @@ -122,6 +132,11 @@ nif.clear_flag(combat_flags,NIF_FLAGS_COMBAT) nif.clear_flag(other_flags,NIF_FLAGS_OTHER) + if(vision_exclusive) + var/mob/living/carbon/human/H = nif.human + if(H && istype(H)) + H.recalculate_vis() + return nif_result //Called when an implant expires @@ -215,7 +230,7 @@ qdel(src) else new stored_organic(Ht.nif,extra) - qdel(src) + qdel(src) else icon_state = "[initial(icon_state)]" //If it fails to apply to a valid target and doesn't get deleted, reset its icon state update_icon() @@ -348,7 +363,7 @@ /datum/nifsoft/package/mining software = list(/datum/nifsoft/material,/datum/nifsoft/spare_breath) - + /datum/nifsoft/package/mining_synth software = list(/datum/nifsoft/material,/datum/nifsoft/pressure,/datum/nifsoft/heatsinks) diff --git a/code/modules/nifsoft/software/01_vision.dm b/code/modules/nifsoft/software/01_vision.dm index c68a6feb0c..afc1e533d1 100644 --- a/code/modules/nifsoft/software/01_vision.dm +++ b/code/modules/nifsoft/software/01_vision.dm @@ -104,14 +104,9 @@ tick_flags = NIF_ACTIVETICK planes_enabled = list(VIS_FULLBRIGHT, VIS_MESONS) vision_flags = (NIF_V_MESONS) + vision_flags_mob = SEE_TURFS incompatible_with = list(NIF_MATERIAL,NIF_THERMALS,NIF_NIGHTVIS) - -/datum/nifsoft/mesons/life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_TURFS - if(H.client) - H.client.screen |= global_hud.meson + vision_exclusive = TRUE /datum/nifsoft/material name = "Material Scanner" @@ -123,14 +118,9 @@ tick_flags = NIF_ACTIVETICK planes_enabled = list(VIS_FULLBRIGHT) vision_flags = (NIF_V_MATERIAL) + vision_flags_mob = SEE_OBJS incompatible_with = list(NIF_MESONS,NIF_THERMALS,NIF_NIGHTVIS) - -/datum/nifsoft/material/life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_OBJS - if(H.client) - H.client.screen |= global_hud.material + vision_exclusive = TRUE /datum/nifsoft/thermals name = "Thermal Scanner" @@ -143,14 +133,9 @@ tick_flags = NIF_ACTIVETICK planes_enabled = list(VIS_FULLBRIGHT, VIS_CLOAKED) vision_flags = (NIF_V_THERMALS) + vision_flags_mob = SEE_MOBS incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_NIGHTVIS) - -/datum/nifsoft/thermals/life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.sight |= SEE_MOBS - if(H.client) - H.client.screen |= global_hud.thermal + vision_exclusive = TRUE /datum/nifsoft/nightvis name = "Low-Light Amp" @@ -162,11 +147,6 @@ tick_flags = NIF_ACTIVETICK planes_enabled = list(VIS_FULLBRIGHT) vision_flags = (NIF_V_NIGHTVIS) + darkness_view = 7 incompatible_with = list(NIF_MESONS,NIF_MATERIAL,NIF_THERMALS) - -/datum/nifsoft/nightvis/life() - if((. = ..())) - var/mob/living/carbon/human/H = nif.human - H.see_in_dark += 7 - if(H.client) - H.client.screen |= global_hud.nvg + vision_exclusive = TRUE diff --git a/code/modules/planet/virgo3c_vr.dm b/code/modules/planet/virgo3c_vr.dm index d3c37710d2..61fef30e80 100644 --- a/code/modules/planet/virgo3c_vr.dm +++ b/code/modules/planet/virgo3c_vr.dm @@ -53,7 +53,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null var/min = 0 switch(sun_position) - if(0 to 0.475) // Night + if(0 to 0.3) // Night low_brightness = 0.3 low_color = "#000066" @@ -61,7 +61,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null high_color = "#66004D" min = 0 - if(0.475 to 0.50) // Twilight + if(0.3 to 0.35) // Twilight low_brightness = 0.5 low_color = "#66004D" @@ -69,7 +69,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null high_color = "#CC3300" min = 0.40 - if(0.50 to 0.525) // Sunrise/set + if(0.35 to 0.45) // Sunrise/set low_brightness = 0.9 low_color = "#CC3300" @@ -77,7 +77,7 @@ var/datum/planet/virgo3c/planet_virgo3c = null high_color = "#FF9933" min = 0.50 - if(0.525 to 1.00) // Noon + if(0.45 to 1.00) // Noon low_brightness = 3.0 low_color = "#DDDDDD" diff --git a/code/modules/xenobio/items/slimepotions_vr.dm b/code/modules/xenobio/items/slimepotions_vr.dm index 3ad720c2fc..540a610056 100644 --- a/code/modules/xenobio/items/slimepotions_vr.dm +++ b/code/modules/xenobio/items/slimepotions_vr.dm @@ -164,6 +164,8 @@ to_chat(user, "You feed \the [M] the agent. It may now eventually develop proper sapience.") M.ghostjoin = 1 active_ghost_pods |= M + if(!M.vore_active) + M.verbs += /mob/living/simple_mob/proc/animal_nom M.ghostjoin_icon() log_and_message_admins("[key_name_admin(user)] used a sapience potion on a simple mob: [M]. [ADMIN_FLW(src)]") playsound(src, 'sound/effects/bubbles.ogg', 50, 1) diff --git a/maps/groundbase/gb-z1.dmm b/maps/groundbase/gb-z1.dmm index bdea78e177..74e42e25de 100644 --- a/maps/groundbase/gb-z1.dmm +++ b/maps/groundbase/gb-z1.dmm @@ -241,7 +241,7 @@ pixel_x = 32 }, /turf/simulated/floor/outdoors/grass/virgo3c, -/area/groundbase/unexplored/outdoors) +/area/groundbase/level1/centsquare) "aE" = ( /obj/machinery/shieldgen, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -427,6 +427,9 @@ }, /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level1/centsquare) +"bg" = ( +/turf/simulated/wall, +/area/groundbase/civilian/womensrestroom) "bh" = ( /obj/structure/cable/yellow{ icon_state = "1-8" @@ -454,6 +457,13 @@ /obj/structure/cable/yellow, /turf/simulated/floor/tiled/dark, /area/groundbase/medical/autoresleeving) +"bm" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall3"; + name = "Women's Restroom Stall" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/womensrestroom) "bn" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, @@ -646,6 +656,21 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/apparel) +"bM" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "bO" = ( /obj/structure/table/bench/steel, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -859,6 +884,23 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/nwtunnel) +"cp" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/obj/machinery/power/apc{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/groundbase/civilian/mensrestroom) "cq" = ( /obj/structure/table/standard, /obj/random/tech_supply, @@ -2019,6 +2061,18 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/aiciv) +"fl" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/effect/floor_decal/corner/pink{ + dir = 5 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "fm" = ( /turf/simulated/floor/tiled/dark/virgo3c{ edge_blending_priority = -1; @@ -2501,6 +2555,16 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/engineering/engine) +"gy" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/alarm{ + dir = 8 + }, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "gz" = ( /turf/simulated/floor/tiled/dark, /area/groundbase/security/hos) @@ -2754,10 +2818,21 @@ id = "PubPrep"; name = "Public Access Shutter"; pixel_x = -26; - req_access = list(62) + req_access = null; + req_one_access = list(18) }, /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level1/centsquare) +"hh" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/pink{ + dir = 9 + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = -30 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "hi" = ( /obj/machinery/recharger/wallcharger{ pixel_x = 4; @@ -5420,6 +5495,18 @@ }, /turf/simulated/wall, /area/groundbase/medical/autoresleeving) +"nN" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 6 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "nO" = ( /obj/machinery/suit_cycler, /turf/simulated/floor/tiled, @@ -5431,6 +5518,18 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/groundbase/engineering/workshop) +"nQ" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "nR" = ( /obj/machinery/light{ dir = 4 @@ -5451,6 +5550,9 @@ "nU" = ( /obj/structure/table/reinforced, /obj/item/device/paicard, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/foodplace) "nV" = ( @@ -5774,6 +5876,13 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/nwtunnel) +"oL" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall1"; + name = "Women's Restroom Stall" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/womensrestroom) "oM" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -5814,6 +5923,13 @@ "oP" = ( /turf/simulated/wall, /area/groundbase/level1/northspur) +"oQ" = ( +/obj/structure/table/glass, +/obj/machinery/recharger{ + pixel_y = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "oR" = ( /obj/machinery/light{ dir = 8 @@ -5979,6 +6095,17 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/halle) +"po" = ( +/obj/structure/toilet, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "z1stall3"; + pixel_x = -27; + specialfunctions = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "pp" = ( /mob/living/simple_mob/vore/alienanimals/catslug/custom/engislug{ ghostjoin = 1 @@ -6513,6 +6640,15 @@ "qE" = ( /turf/simulated/mineral/cave/virgo3c, /area/groundbase/level1/ne) +"qF" = ( +/obj/structure/table/reinforced, +/obj/machinery/cell_charger{ + pixel_y = 7 + }, +/obj/item/weapon/cell/high, +/obj/item/weapon/cell/high, +/turf/simulated/floor/tiled, +/area/groundbase/cargo/mining) "qG" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -6702,6 +6838,22 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/iaa1) +"rg" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/pink/full{ + dir = 1 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "rh" = ( /obj/machinery/recharge_station, /obj/machinery/atmospherics/unary/vent_scrubber/on{ @@ -6758,13 +6910,13 @@ dir = 4 }, /obj/machinery/door/airlock/glass{ - name = "Gateway" + name = "EVA Access" }, /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; layer = 3.3; - name = "Gateway Access Shutters" + name = "EVA Access Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7123,6 +7275,27 @@ }, /turf/simulated/floor, /area/groundbase/engineering/storage) +"sk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/mirror{ + icon_state = "mirror_broke"; + pixel_y = 37 + }, +/obj/structure/sink/kitchen{ + pixel_y = 16 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/firealarm{ + dir = 1 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/groundbase/civilian/mensrestroom) "sl" = ( /obj/machinery/camera/network/engineering{ dir = 4 @@ -7171,6 +7344,17 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"sr" = ( +/obj/structure/toilet, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "z1stall1"; + pixel_x = -27; + specialfunctions = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "ss" = ( /obj/structure/cable{ icon_state = "1-2" @@ -7387,6 +7571,7 @@ /obj/structure/window/reinforced{ dir = 1 }, +/obj/structure/ore_box, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "sR" = ( @@ -7518,6 +7703,9 @@ }, /turf/simulated/floor/tiled, /area/groundbase/security/processing) +"tj" = ( +/turf/simulated/wall, +/area/groundbase/civilian/mensrestroom) "tk" = ( /obj/structure/cable{ icon_state = "2-4" @@ -7794,6 +7982,11 @@ /obj/machinery/atmospherics/unary/vent_scrubber/on, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"tT" = ( +/turf/simulated/floor/outdoors/grass/virgo3c{ + outdoors = 0 + }, +/area/groundbase/unexplored/outdoors) "tU" = ( /obj/machinery/mineral/stacking_unit_console{ density = 0; @@ -7856,6 +8049,22 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/detective) +"ue" = ( +/obj/machinery/door/airlock{ + name = "Men's Restroom" + }, +/obj/machinery/door/firedoor, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/mensrestroom) "uf" = ( /obj/structure/table/standard, /obj/item/weapon/stock_parts/subspace/sub_filter, @@ -8281,6 +8490,21 @@ /obj/structure/stairs/spawner/east, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) +"vl" = ( +/obj/machinery/light/small, +/obj/structure/toilet/prison{ + dir = 4 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "z1stall4"; + pixel_x = -27; + specialfunctions = 4 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/asteroid_steel, +/area/groundbase/civilian/mensrestroom) "vm" = ( /obj/machinery/smartfridge/drinks, /turf/simulated/floor/lino, @@ -8484,6 +8708,27 @@ }, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/security/halls) +"vI" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light_switch{ + pixel_x = 15; + pixel_y = 30 + }, +/turf/simulated/floor/tiled/asteroid_steel, +/area/groundbase/civilian/mensrestroom) "vJ" = ( /obj/effect/landmark/arrivals, /turf/simulated/floor/tiled/techfloor, @@ -8709,6 +8954,16 @@ "wl" = ( /turf/simulated/wall/r_wall, /area/groundbase/security/lobby) +"wm" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "wn" = ( /obj/structure/bed/chair/sofa/bench, /obj/effect/landmark/start/visitor, @@ -9055,6 +9310,21 @@ /obj/machinery/light, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/storage) +"xe" = ( +/obj/machinery/light/small, +/obj/structure/toilet/prison{ + dir = 8 + }, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "z1stall4"; + pixel_x = -27; + specialfunctions = 4 + }, +/obj/effect/floor_decal/rust, +/obj/effect/decal/cleanable/dirt, +/turf/simulated/floor/tiled/asteroid_steel, +/area/groundbase/civilian/mensrestroom) "xf" = ( /obj/machinery/power/breakerbox/activated{ RCon_tag = "Engineering Substation Bypass" @@ -9310,6 +9580,12 @@ }, /turf/simulated/floor/lino, /area/groundbase/civilian/bar) +"xF" = ( +/obj/effect/floor_decal/corner/pink{ + dir = 10 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "xG" = ( /obj/machinery/telecomms/processor/preset_one, /obj/machinery/atmospherics/pipe/simple/hidden/black{ @@ -9527,6 +9803,19 @@ }, /turf/simulated/floor/bluegrid, /area/groundbase/command/ai/upload) +"yj" = ( +/obj/machinery/vending/wallmed1/public{ + pixel_y = 28 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/bar) +"yk" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/pink{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "yl" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/engineering{ @@ -9796,6 +10085,18 @@ }, /turf/simulated/floor/carpet/sblucarpet, /area/groundbase/security/iaa2) +"yU" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/level1/centsquare) "yV" = ( /obj/machinery/station_map{ pixel_y = 32 @@ -9862,6 +10163,17 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/bmarble, /area/groundbase/civilian/toolstorage) +"zc" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/power/apc{ + dir = 4 + }, +/obj/structure/cable/yellow, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "zd" = ( /obj/structure/cable/yellow{ icon_state = "1-2" @@ -10289,6 +10601,9 @@ pixel_x = 1; pixel_y = -1 }, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/civilian/gateway) "zZ" = ( @@ -10735,6 +11050,15 @@ "Bh" = ( /turf/unsimulated/wall/planetary/virgo3c, /area/groundbase/level1/se) +"Bj" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall5"; + name = "Men's Restroom Stall" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/mensrestroom) "Bk" = ( /turf/simulated/floor/outdoors/newdirt_nograss{ outdoors = 0 @@ -10829,6 +11153,14 @@ outdoors = 0 }, /area/maintenance/groundbase/level1/nwtunnel) +"Bv" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/sidewalk/virgo3c, +/area/groundbase/level1/centsquare) "Bw" = ( /obj/item/weapon/stool/padded{ dir = 4 @@ -11672,6 +12004,15 @@ }, /turf/simulated/floor/outdoors/sidewalk/side/virgo3c, /area/groundbase/level1/northspur) +"DB" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall4"; + name = "Men's Restroom Stall" + }, +/obj/effect/decal/cleanable/dirt, +/obj/effect/floor_decal/rust, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/mensrestroom) "DC" = ( /obj/structure/bookcase, /obj/item/weapon/book/manual/security_space_law, @@ -12319,6 +12660,19 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) +"Fl" = ( +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/obj/effect/floor_decal/corner/pink{ + dir = 9 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "Fm" = ( /obj/structure/cable{ icon_state = "2-4" @@ -12750,6 +13104,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/armory) +"Gt" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "Gu" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 8 @@ -12876,6 +13242,18 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/substation/medcargo) +"GM" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "GN" = ( /obj/machinery/mech_recharger, /turf/simulated/floor/tiled/dark, @@ -13318,6 +13696,16 @@ /obj/structure/disposalpipe/trunk, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"HO" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/effect/floor_decal/corner/pink{ + dir = 6 + }, +/obj/structure/sign/painting/library_secure{ + pixel_x = 30 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "HP" = ( /obj/structure/disposalpipe/segment{ dir = 8; @@ -13737,7 +14125,7 @@ "IS" = ( /obj/structure/stairs/spawner/east, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, -/area/groundbase/level1/se) +/area/groundbase/level1/centsquare) "IU" = ( /obj/structure/cable{ icon_state = "1-4" @@ -13953,6 +14341,22 @@ outdoors = 0 }, /area/groundbase/civilian/clown) +"Jz" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/machinery/atmospherics/unary/vent_pump/on, +/obj/machinery/light{ + dir = 8 + }, +/obj/effect/floor_decal/corner/pink/full{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "JA" = ( /obj/machinery/computer/secure_data{ dir = 4 @@ -14369,6 +14773,21 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/engineering/workshop) +"Kt" = ( +/obj/machinery/door/airlock{ + id_tag = "z1stall2"; + name = "Women's Restroom Stall" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/womensrestroom) +"Ku" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "Kv" = ( /obj/machinery/hologram/holopad, /turf/simulated/floor/tiled, @@ -14564,11 +14983,10 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) "KZ" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 9 +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers, +/obj/structure/cable/yellow{ + icon_state = "1-4" }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) @@ -15502,6 +15920,10 @@ /area/groundbase/medical/or2) "Nj" = ( /obj/machinery/atmospherics/pipe/simple/hidden/universal, +/obj/structure/table/reinforced, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/cargo/mining) "Nk" = ( @@ -16636,6 +17058,22 @@ }, /turf/simulated/wall, /area/groundbase/civilian/bar) +"Qp" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Women's Restroom" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/bmarble, +/area/groundbase/civilian/womensrestroom) "Qq" = ( /turf/simulated/wall/r_wall, /area/maintenance/groundbase/level1/swtunnel) @@ -16701,6 +17139,18 @@ }, /turf/simulated/floor, /area/maintenance/groundbase/trashpit) +"QB" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "QC" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/equipment) @@ -16816,6 +17266,17 @@ /obj/machinery/pipedispenser/disposal, /turf/simulated/floor/tiled, /area/groundbase/engineering/atmos) +"QV" = ( +/obj/structure/toilet, +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "z1stall2"; + pixel_x = -27; + specialfunctions = 4 + }, +/obj/machinery/light/small, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "QW" = ( /obj/structure/cable{ icon_state = "1-2" @@ -17229,13 +17690,13 @@ "RU" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass{ - name = "Gateway" + name = "EVA Access" }, /obj/machinery/door/blast/shutters{ dir = 4; id = "PubPrep"; layer = 3.3; - name = "Gateway Access Shutters" + name = "EVA Access Shutters" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -17994,6 +18455,18 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/lobby) +"TK" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, +/turf/simulated/floor/outdoors/sidewalk/side/virgo3c, +/area/groundbase/level1/centsquare) "TL" = ( /obj/structure/table/rack/steel, /obj/item/weapon/stock_parts/matter_bin, @@ -18067,6 +18540,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/security/processing) +"TV" = ( +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 1 + }, +/obj/effect/floor_decal/corner/pink/full, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "TW" = ( /obj/structure/cable{ icon_state = "4-8" @@ -18127,6 +18607,19 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/security/equipment) +"Ue" = ( +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 1 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/effect/floor_decal/corner/pink/full{ + dir = 4 + }, +/obj/structure/flora/pottedplant/orientaltree, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "Uf" = ( /turf/simulated/wall, /area/groundbase/civilian/foodplace) @@ -18142,6 +18635,18 @@ }, /turf/simulated/floor/tiled/techfloor, /area/groundbase/command/ai/storage) +"Uh" = ( +/obj/machinery/firealarm{ + dir = 1 + }, +/obj/effect/floor_decal/corner/pink/full, +/obj/structure/flora/pottedplant/orientaltree, +/obj/machinery/light_switch{ + dir = 4; + pixel_x = -30 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "Ui" = ( /obj/effect/landmark{ name = "JoinLateCyborg" @@ -19022,6 +19527,21 @@ }, /turf/simulated/floor/tiled/techfloor/grid, /area/groundbase/command/ai/foyer) +"WH" = ( +/obj/structure/cable/yellow{ + icon_state = "2-8" + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 4 + }, +/obj/structure/cable/yellow{ + icon_state = "1-8" + }, +/turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, +/area/groundbase/level1/centsquare) "WI" = ( /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, @@ -19124,6 +19644,13 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lhallway) +"WT" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/effect/floor_decal/corner/pink{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/civilian/womensrestroom) "WU" = ( /obj/machinery/vending/fishing, /obj/machinery/light{ @@ -19913,6 +20440,9 @@ /obj/structure/cable/yellow{ icon_state = "1-4" }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level1/centsquare) "YX" = ( @@ -24324,7 +24854,7 @@ ht KR GF GF -GF +oQ uF pj ce @@ -26450,7 +26980,7 @@ pj pj pj pj -MP +yj kW ey LN @@ -28684,12 +29214,12 @@ MO MO MO MO -eR +tT tG -tG -tG -Rn -Rn +WL +WL +WB +WB Rn WB WB @@ -30305,14 +30835,14 @@ ay ay ay YW -Oz -Oz -Oz -Oz -Oz -Oz -Oz -Oz +ay +ay +ay +ay +ay +ay +ay +ay KZ Eb Eb @@ -30455,7 +30985,7 @@ eR eR eR Eb -Zh +TK Eb Eb Nv @@ -30597,7 +31127,7 @@ eR eR eR Eb -Zh +TK Eb Eb Nv @@ -30739,7 +31269,7 @@ eR eR eR Io -Zh +TK Eb Nv Eb @@ -30881,7 +31411,7 @@ pc eR eR US -Zh +TK Lk Eb Eb @@ -31023,12 +31553,12 @@ pc eR eR Hx -OA -Vs -Vs -Vs -Vs -OA +GM +ay +ay +ay +ay +QB Vs Vs Vs @@ -31170,7 +31700,7 @@ Gv Ge Eb Eb -Zh +TK Eb Eb qI @@ -31252,7 +31782,7 @@ pF oN SB dH -Mo +qF pF Go Mo @@ -31312,7 +31842,7 @@ eR eR eR eR -Zh +TK Eb Eb Eb @@ -31454,7 +31984,7 @@ eR eR eR eR -Zh +TK Eb Nv Eb @@ -31596,7 +32126,7 @@ pc pc pc eR -Zh +TK Eb Nv Nv @@ -31738,7 +32268,7 @@ pc pc eR eR -Zh +TK Eb Nv Nv @@ -31880,7 +32410,7 @@ pc eR eR eR -Zh +TK Eb Eb Nv @@ -32018,15 +32548,15 @@ pc eR eR pc -eR -eR -eR -eR -OA -OA -Eb -Eb -Eb +nN +Bv +Bv +Bv +WH +Ku +ay +ay +QB Nv Eb Eb @@ -32159,17 +32689,17 @@ pc pc pc eR -eR -eR -eR -eR +Eb +TK +Eb +Eb aD GQ Mj Eb Eb -Eb -Eb +yU +Yt Eb Lt Lt @@ -32301,24 +32831,24 @@ eR eR eR eR -eR -Eb +Yt +TK Lt Lt ua IS IS -ua -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt +bg +bg +Qp +bg +bg +bg +bg +bg +bg +bg +bg Lt Lt Lt @@ -32443,24 +32973,24 @@ eR eR eR eR -eR -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt +tj +ue +tj +tj +tj +ua +ua +bg +Jz +Fl +Uh +bg +sr +bg +QV +bg +po +bg Lt Lt Lt @@ -32585,24 +33115,24 @@ eR eR eR eR -eR -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt +tj +vI +DB +vl +tj Lt Lt +bg +fl +nQ +xF +bg +oL +bg +Kt +bg +bm +bg Lt Lt Lt @@ -32727,24 +33257,24 @@ Eb Eb Eb Eb +tj +sk +tj +tj +tj Lt Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt +bg +fl +Gt +WT +hh +yk +hh +yk +hh +TV +bg Lt Lt Lt @@ -32869,24 +33399,24 @@ Eb FE lZ lZ +tj +cp +Bj +xe +tj Lt Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt -Lt +bg +rg +bM +zc +HO +wm +HO +gy +HO +Ue +bg Lt Lt Lt diff --git a/maps/groundbase/gb-z2.dmm b/maps/groundbase/gb-z2.dmm index 5b085bdfb9..3e9cffc768 100644 --- a/maps/groundbase/gb-z2.dmm +++ b/maps/groundbase/gb-z2.dmm @@ -45,14 +45,11 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/science/picnic) "ai" = ( -/obj/machinery/firealarm{ - dir = 4 +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" }, -/obj/structure/disposalpipe/trunk{ - dir = 8 - }, -/obj/machinery/disposal, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room2) "ak" = ( /obj/machinery/atmospherics/pipe/simple/hidden/cyan, @@ -95,6 +92,8 @@ /area/groundbase/level2/ne) "ar" = ( /obj/machinery/light, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) "as" = ( @@ -135,6 +134,7 @@ "ax" = ( /obj/structure/closet/secure_closet/personal, /obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room7) "ay" = ( @@ -227,13 +227,10 @@ /turf/simulated/floor/wood, /area/groundbase/command/captain) "aN" = ( -/obj/machinery/fitness/punching_bag/clown, /obj/structure/disposalpipe/trunk{ dir = 1 }, /obj/machinery/disposal, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /obj/machinery/light_switch{ dir = 4; pixel_x = -30 @@ -250,8 +247,8 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/janitor) "aP" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/table/woodentable, +/obj/machinery/microwave, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "aQ" = ( @@ -345,8 +342,8 @@ /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "aW" = ( -/obj/structure/bed/chair/sofa/corp/right, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "aX" = ( @@ -395,10 +392,8 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "bc" = ( +/obj/structure/bed/chair/sofa/corp/right, /obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/fitness/punching_bag/clown, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "be" = ( @@ -466,7 +461,7 @@ /area/rnd/xenobiology) "bk" = ( /obj/structure/cable/yellow{ - icon_state = "1-8" + icon_state = "1-2" }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) @@ -476,7 +471,7 @@ "bn" = ( /obj/machinery/door/airlock{ id_tag = null; - name = "Restroom" + name = "Unisex Restroom" }, /obj/structure/cable/yellow{ icon_state = "1-2" @@ -833,14 +828,14 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "co" = ( -/obj/machinery/power/apc{ - dir = 8 +/obj/machinery/shower{ + pixel_y = 16 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room3) +/area/groundbase/dorms/room1) "cp" = ( /obj/structure/filingcabinet/filingcabinet, /turf/simulated/floor/tiled, @@ -902,6 +897,7 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/science/hall) "cA" = ( +/obj/machinery/vending/wardrobe/chapdrobe, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "cB" = ( @@ -946,17 +942,14 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "cI" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, -/obj/machinery/power/apc{ - dir = 4; - nightshift_setting = 2 +/obj/machinery/shower{ + pixel_y = 16 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room4) +/area/groundbase/dorms/room2) "cK" = ( /turf/simulated/floor/outdoors/grass/forest/virgo3c, /area/groundbase/unexplored/outdoors) @@ -1091,14 +1084,8 @@ /area/groundbase/science/robotics) "df" = ( /obj/structure/table/woodentable, -/obj/item/device/flashlight/lamp{ - pixel_x = 2; - pixel_y = 7 - }, -/obj/machinery/atmospherics/unary/vent_scrubber/on, -/obj/machinery/alarm{ - dir = 4 - }, +/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/weapon/nullrod, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "dg" = ( @@ -1238,6 +1225,15 @@ }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) +"dB" = ( +/obj/machinery/firealarm{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room5) "dE" = ( /turf/simulated/open, /area/groundbase/cargo/office) @@ -1482,11 +1478,22 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/level2/ne) "eu" = ( -/obj/structure/sign/painting/chapel_secure{ - pixel_y = 30 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/chapel) +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + dir = 1; + name = "shower door"; + req_access = null + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room1) "ev" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -1633,16 +1640,9 @@ /turf/simulated/open/virgo3c, /area/groundbase/level2/westspur) "eO" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/paper_bin{ - pixel_x = -2; - pixel_y = 8 +/obj/structure/sign/painting/chapel_secure{ + pixel_y = 30 }, -/obj/item/weapon/pen/blue{ - pixel_x = 2; - pixel_y = 1 - }, -/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "eP" = ( @@ -1653,8 +1653,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "eR" = ( -/obj/structure/bed/chair/sofa/corp/left, /obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "eS" = ( @@ -1671,8 +1671,11 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "eU" = ( +/obj/structure/cable/yellow{ + icon_state = "1-4" + }, /obj/structure/table/woodentable, -/obj/machinery/microwave, +/obj/random/donkpocketbox, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "eV" = ( @@ -1705,20 +1708,18 @@ /area/medical/virology) "fb" = ( /obj/structure/cable/yellow{ - icon_state = "4-8" - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 9 + icon_state = "1-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 9 + }, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" }, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "fc" = ( @@ -1751,9 +1752,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/command/hop) +"fh" = ( +/obj/machinery/firealarm, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/chapel) "fj" = ( +/obj/machinery/power/apc{ + dir = 1 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "0-2" }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) @@ -1832,6 +1840,12 @@ }, /turf/simulated/floor/tiled, /area/groundbase/command/hop) +"fv" = ( +/obj/structure/sign/painting/chapel_secure{ + pixel_y = 30 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/chapel) "fx" = ( /obj/structure/cable/yellow{ icon_state = "0-4" @@ -1903,6 +1917,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) "fI" = ( @@ -1991,9 +2006,12 @@ /turf/simulated/floor/bmarble, /area/medical/virology) "fO" = ( -/obj/structure/disposalpipe/segment{ - dir = 8; - icon_state = "pipe-c" +/obj/structure/disposalpipe/trunk{ + dir = 8 + }, +/obj/machinery/disposal, +/obj/machinery/firealarm{ + dir = 4 }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) @@ -2112,13 +2130,16 @@ }, /area/groundbase/cargo/office) "gq" = ( -/obj/structure/cable/yellow{ - icon_state = "2-4" +/obj/structure/table/woodentable, +/obj/item/weapon/paper_bin{ + pixel_x = -2; + pixel_y = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 +/obj/item/weapon/pen/blue{ + pixel_x = 2; + pixel_y = 1 }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "gs" = ( @@ -2185,8 +2206,11 @@ /turf/simulated/floor/tiled, /area/rnd/xenobiology) "gA" = ( -/obj/structure/disposalpipe/segment{ - dir = 4 +/obj/structure/bed/chair/wood{ + dir = 1 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 8 }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) @@ -2272,13 +2296,14 @@ "gP" = ( /obj/machinery/button/remote/airlock{ dir = 4; - id = "dorm4"; + id = "dorm6"; pixel_x = -27; specialfunctions = 4 }, +/obj/structure/cable/yellow{ + icon_state = "2-4" + }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "gQ" = ( @@ -2298,6 +2323,9 @@ /obj/machinery/disposal, /turf/simulated/floor/wood, /area/groundbase/civilian/library) +"gS" = ( +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room8) "gT" = ( /obj/machinery/firealarm, /obj/machinery/light{ @@ -3176,11 +3204,13 @@ /turf/simulated/floor/wood, /area/groundbase/dorms/room5) "jq" = ( -/obj/machinery/alarm{ - dir = 4 +/obj/structure/table/woodentable, +/obj/random/donkpocketbox, +/obj/structure/cable/yellow{ + icon_state = "1-8" }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/chapel) +/turf/simulated/floor/wood, +/area/groundbase/dorms/room2) "jr" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -3223,10 +3253,21 @@ /turf/simulated/floor/tiled/freezer/cold, /area/groundbase/civilian/kitchen/freezer) "jx" = ( -/obj/structure/bed/chair/wood/wings, -/obj/effect/landmark/start/chaplain, -/turf/simulated/floor/lino, -/area/groundbase/civilian/chapel/office) +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/window/southright{ + dir = 1; + name = "shower door" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room2) "jy" = ( /obj/machinery/gibber, /turf/simulated/floor/tiled/freezer/cold, @@ -3698,6 +3739,13 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) +"kX" = ( +/obj/structure/table/glass, +/obj/machinery/recharger{ + pixel_y = 5 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/bar) "kY" = ( /obj/machinery/power/apc{ dir = 8 @@ -3756,11 +3804,17 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) "le" = ( -/obj/structure/sign/painting/chapel_secure{ - pixel_y = 30 +/obj/structure/sink{ + pixel_y = 20 }, -/turf/simulated/floor/lino, -/area/groundbase/civilian/chapel/office) +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room1) "lf" = ( /obj/structure/table/woodentable, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -3949,10 +4003,12 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) "lI" = ( -/obj/structure/disposalpipe/trunk{ - dir = 4 +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 5 + }, +/obj/machinery/firealarm{ + dir = 8 }, -/obj/machinery/disposal, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "lJ" = ( @@ -3974,6 +4030,9 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/science/rnd) "lL" = ( @@ -4073,6 +4132,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled, /area/groundbase/science/server) +"ma" = ( +/obj/machinery/photocopier, +/turf/simulated/floor/lino, +/area/groundbase/civilian/chapel/office) "mb" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 @@ -4089,6 +4152,23 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) +"mf" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + dir = 1; + name = "shower door"; + req_access = null + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room5) "mi" = ( /obj/machinery/computer/med_data{ dir = 4 @@ -4296,8 +4376,14 @@ /obj/machinery/recharge_station, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) +"mI" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room8) "mJ" = ( -/obj/effect/landmark/start/chaplain, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "mK" = ( @@ -4322,8 +4408,6 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/bar) "mN" = ( -/obj/item/weapon/bedsheet/browndouble, -/obj/structure/bed/double/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, @@ -4360,10 +4444,8 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "mU" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room6) +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room1) "mW" = ( /obj/item/weapon/storage/box/botanydisk, /obj/structure/table/glass, @@ -4496,9 +4578,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/rd) "nv" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/white, /area/groundbase/dorms/room2) "nw" = ( /obj/machinery/vending/wardrobe/robodrobe, @@ -4739,6 +4819,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/groundbase/medical/psych) +"oj" = ( +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room6) "ok" = ( /obj/machinery/light, /obj/machinery/vending/blood, @@ -4778,6 +4865,7 @@ /area/groundbase/cargo/office) "op" = ( /obj/machinery/light, +/obj/machinery/suspension_gen, /turf/simulated/floor/tiled, /area/groundbase/science/hall) "oq" = ( @@ -4854,10 +4942,11 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/medical/lobby) "oE" = ( -/obj/machinery/firealarm{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room3) "oF" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c{ @@ -4884,7 +4973,7 @@ /area/groundbase/level2/nw) "oL" = ( /obj/structure/table/woodentable, -/obj/random/donkpocketbox, +/obj/machinery/microwave, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) "oM" = ( @@ -4941,8 +5030,6 @@ /turf/simulated/floor/tiled/white, /area/medical/virology) "oU" = ( -/obj/item/weapon/bedsheet/browndouble, -/obj/structure/bed/double/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -5095,6 +5182,9 @@ }, /turf/simulated/floor/reinforced, /area/rnd/xenobiology) +"pr" = ( +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room6) "ps" = ( /obj/structure/railing/grey{ dir = 1 @@ -5259,10 +5349,39 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) +"pO" = ( +/obj/structure/sink{ + dir = 4; + pixel_x = 11 + }, +/obj/structure/mirror{ + dir = 8; + pixel_x = 23 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room7) "pP" = ( /obj/machinery/transhuman/synthprinter, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) +"pT" = ( +/obj/machinery/suspension_gen, +/turf/simulated/floor/tiled, +/area/groundbase/science/hall) +"pU" = ( +/obj/machinery/door/firedoor, +/obj/machinery/door/airlock{ + name = "Chapel Office"; + req_access = list(27) + }, +/obj/structure/cable/yellow{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/disposalpipe/segment, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/civilian/chapel) "pV" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5329,6 +5448,9 @@ dir = 4 }, /obj/machinery/light, +/obj/structure/closet/secure_closet/personal, +/obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "qg" = ( @@ -5538,9 +5660,10 @@ /turf/simulated/floor/wood, /area/groundbase/dorms/room8) "qJ" = ( +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "qK" = ( @@ -5658,8 +5781,17 @@ /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "rc" = ( +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, /obj/structure/table/woodentable, -/obj/random/donkpocketbox, +/obj/machinery/microwave, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 4 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "rf" = ( @@ -5735,6 +5867,19 @@ outdoors = 0 }, /area/groundbase/level2/nw) +"rp" = ( +/obj/structure/closet/wardrobe/chaplain_black, +/obj/item/weapon/storage/fancy/crayons, +/obj/item/weapon/flame/candle/candelabra, +/obj/item/weapon/flame/candle/candelabra, +/obj/item/weapon/flame/candle/candelabra, +/obj/item/weapon/flame/candle/candelabra, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -30 + }, +/turf/simulated/floor/lino, +/area/groundbase/civilian/chapel/office) "rq" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -5825,9 +5970,17 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot/storage) "rD" = ( -/obj/machinery/firealarm, -/turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/chapel) +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/machinery/alarm{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room2) "rE" = ( /obj/machinery/light/small{ dir = 1 @@ -5928,6 +6081,22 @@ /obj/machinery/camera/network/civilian, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) +"rR" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/window/southright{ + dir = 1; + name = "shower door" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room6) "rT" = ( /obj/machinery/camera/network/research/xenobio{ dir = 4 @@ -5948,6 +6117,12 @@ }, /turf/simulated/floor/tiled, /area/rnd/xenobiology) +"rX" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room8) "rZ" = ( /obj/machinery/light, /turf/simulated/floor/tiled/white, @@ -6024,8 +6199,9 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "so" = ( -/obj/structure/bed/chair/sofa/corp, /obj/machinery/alarm, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "sp" = ( @@ -6052,6 +6228,18 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/groundbase/command/bridge) +"st" = ( +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/curtain/open/shower, +/obj/structure/window/basic{ + dir = 8 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/groundbase/dorms/room8) "su" = ( /obj/structure/railing/grey{ dir = 4 @@ -6066,9 +6254,11 @@ icon_state = "2-8" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/light_switch{ - dir = 8; - pixel_x = 30 +/obj/machinery/light{ + dir = 4 + }, +/obj/structure/bed/chair/sofa/corp/right{ + dir = 8 }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) @@ -6176,14 +6366,9 @@ /turf/simulated/floor/wood, /area/groundbase/command/captain) "sL" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 }, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "sM" = ( @@ -6233,7 +6418,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "sU" = ( -/obj/machinery/photocopier, +/obj/effect/landmark/start/chaplain, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "sV" = ( @@ -6502,15 +6687,11 @@ }, /area/groundbase/level2/nw) "tP" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, -/obj/structure/cable/yellow{ - icon_state = "1-8" +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" }, -/obj/machinery/firealarm{ - dir = 4 - }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room4) "tQ" = ( /obj/machinery/door/firedoor, @@ -6617,6 +6798,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) +"uf" = ( +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room7) "ug" = ( /obj/structure/cable/yellow{ icon_state = "2-4" @@ -6791,6 +6975,18 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/groundbase/science/rd) +"uH" = ( +/obj/structure/sink{ + dir = 8; + pixel_x = -12; + pixel_y = 2 + }, +/obj/structure/mirror{ + dir = 4; + pixel_x = -23 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room8) "uI" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 @@ -6924,6 +7120,13 @@ /obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/tiled, /area/groundbase/science/xenohall) +"vi" = ( +/obj/machinery/light, +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room7) "vj" = ( /obj/structure/bed/chair/comfy/blue{ dir = 4 @@ -6960,6 +7163,18 @@ }, /turf/simulated/floor/bmarble, /area/groundbase/science/hall) +"vq" = ( +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/curtain/open/shower, +/obj/structure/window/basic{ + dir = 4 + }, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/groundbase/dorms/room7) "vr" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -6994,6 +7209,22 @@ }, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"vw" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/alarm{ + dir = 8 + }, +/obj/machinery/door/window/southright{ + dir = 1; + name = "shower door" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room8) "vy" = ( /obj/structure/railing/grey{ dir = 4 @@ -7063,6 +7294,15 @@ }, /turf/simulated/floor/carpet, /area/groundbase/civilian/library) +"vK" = ( +/obj/structure/closet/secure_closet/personal, +/obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, +/obj/machinery/firealarm{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room6) "vL" = ( /obj/machinery/door/firedoor, /obj/machinery/door/window/southright{ @@ -7266,11 +7506,12 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "wk" = ( -/obj/machinery/light_switch{ - pixel_y = 30 +/obj/machinery/light, +/obj/structure/toilet{ + dir = 4 }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/chapel) +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room1) "wm" = ( /obj/machinery/computer/supplycomp/control{ dir = 8 @@ -7286,6 +7527,10 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"wo" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room6) "wp" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -8028,13 +8273,19 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, +/obj/machinery/light_switch{ + dir = 1; + pixel_y = -30 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "yC" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room5) +/obj/structure/toilet{ + dir = 8 + }, +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room2) "yE" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -8333,11 +8584,14 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "zG" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 5 +/obj/structure/table/woodentable, +/obj/item/device/flashlight/lamp{ + pixel_x = 2; + pixel_y = 7 }, -/obj/machinery/firealarm{ - dir = 8 +/obj/machinery/atmospherics/unary/vent_scrubber/on, +/obj/machinery/alarm{ + dir = 4 }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) @@ -8853,7 +9107,17 @@ /area/groundbase/civilian/library) "AY" = ( /obj/structure/table/woodentable, -/obj/random/donkpocketbox, +/obj/machinery/microwave, +/obj/machinery/atmospherics/unary/vent_pump/on{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 4; + nightshift_setting = 2 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "AZ" = ( @@ -8877,14 +9141,15 @@ }, /turf/simulated/open, /area/groundbase/civilian/bar) +"Bc" = ( +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room5) "Be" = ( -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/structure/barricade/cutout/clown, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/bed/chair/sofa/corp/left, /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/unary/vent_pump/on, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "Bf" = ( @@ -9031,10 +9296,9 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) "BC" = ( -/obj/structure/barricade/cutout/clown, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /obj/machinery/light, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "BD" = ( @@ -9140,12 +9404,14 @@ /turf/simulated/open/virgo3c, /area/groundbase/level2/northspur) "BX" = ( -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" +/obj/machinery/shower{ + pixel_y = 16 }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room1) +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/groundbase/dorms/room3) "BY" = ( /obj/structure/mirror{ dir = 4; @@ -9269,7 +9535,8 @@ /turf/simulated/floor/tiled, /area/groundbase/command/hop) "Cl" = ( -/obj/structure/table/woodentable, +/obj/structure/bed/chair/wood/wings, +/obj/effect/landmark/start/chaplain, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "Cq" = ( @@ -9551,14 +9818,9 @@ /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level2/ne) "Df" = ( -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9 }, -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "Dh" = ( @@ -9821,9 +10083,14 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "DN" = ( -/obj/machinery/vending/wardrobe/chapdrobe, -/turf/simulated/floor/lino, -/area/groundbase/civilian/chapel/office) +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/groundbase/dorms/room4) "DO" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -9832,6 +10099,8 @@ /area/groundbase/medical/lobby) "DP" = ( /obj/machinery/light, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room5) "DQ" = ( @@ -10111,16 +10380,28 @@ /turf/simulated/open/virgo3c, /area/groundbase/level2/southwestspur) "EC" = ( -/obj/structure/bed/chair/sofa/corp, /obj/machinery/alarm, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "ED" = ( -/obj/structure/table/woodentable, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, -/obj/item/weapon/nullrod, -/turf/simulated/floor/lino, -/area/groundbase/civilian/chapel/office) +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/light{ + dir = 8 + }, +/obj/machinery/door/window/southleft{ + dir = 1; + name = "shower door"; + req_access = null + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room3) "EE" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 1 @@ -10138,8 +10419,6 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "EH" = ( -/obj/item/weapon/bedsheet/browndouble, -/obj/structure/bed/double/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) @@ -10167,8 +10446,7 @@ /turf/simulated/floor/tiled, /area/groundbase/science/rnd) "EN" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, +/obj/structure/bed/chair/sofa/corp, /obj/machinery/alarm, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) @@ -10341,6 +10619,13 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/hop) +"Fr" = ( +/obj/machinery/light, +/obj/structure/toilet{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room5) "Fs" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c{ outdoors = 0 @@ -10569,6 +10854,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/cargo/office) +"Gg" = ( +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room5) "Gi" = ( /obj/structure/reagent_dispensers/watertank, /obj/item/weapon/reagent_containers/glass/bucket, @@ -10992,14 +11289,16 @@ /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/level2/nw) "Ho" = ( -/obj/machinery/power/apc{ - dir = 8 - }, +/obj/structure/table/woodentable, +/obj/random/donkpocketbox, /obj/structure/cable/yellow{ icon_state = "0-4" }, +/obj/machinery/power/apc{ + dir = 8 + }, /turf/simulated/floor/wood, -/area/groundbase/dorms/room5) +/area/groundbase/dorms/room3) "Hp" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/multi_tile/glass{ @@ -11016,6 +11315,10 @@ }, /turf/simulated/floor/carpet, /area/groundbase/command/hop) +"Ht" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room5) "Hu" = ( /obj/structure/disposalpipe/segment{ dir = 2; @@ -11137,9 +11440,9 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/civilian/hydroponics) "HI" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, -/obj/machinery/fitness/punching_bag/clown, +/obj/structure/cable/yellow{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "HJ" = ( @@ -11206,6 +11509,23 @@ }, /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) +"HV" = ( +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 + }, +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 + }, +/obj/machinery/door/window/southleft{ + dir = 1; + name = "shower door"; + req_access = null + }, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room7) "HX" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 4 @@ -11310,16 +11630,33 @@ /turf/simulated/floor/carpet/bcarpet, /area/groundbase/civilian/mime) "Im" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/structure/table/woodentable, +/obj/random/donkpocketbox, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/groundbase/dorms/room3) +/area/groundbase/dorms/room4) "In" = ( /obj/structure/grille, /obj/structure/window/reinforced/full, /obj/machinery/door/firedoor, /turf/simulated/floor, /area/groundbase/civilian/hydroponics) +"Io" = ( +/obj/structure/table/woodentable, +/obj/random/donkpocketbox, +/obj/machinery/power/apc{ + dir = 8 + }, +/obj/structure/cable/yellow{ + icon_state = "0-4" + }, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room5) "Ip" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -11431,6 +11768,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) +"IF" = ( +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/disposal, +/turf/simulated/floor/lino, +/area/groundbase/civilian/chapel/office) "IH" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/white, @@ -11489,6 +11833,12 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/library) +"IS" = ( +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/turf/simulated/floor/lino, +/area/groundbase/civilian/chapel/office) "IT" = ( /obj/machinery/hologram/holopad, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ @@ -11560,14 +11910,21 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "IY" = ( -/obj/machinery/power/apc{ - dir = 8 +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 9 }, -/obj/structure/cable/yellow{ - icon_state = "0-4" +/obj/effect/floor_decal/steeldecal/steel_decals10{ + dir = 10 }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room1) +/obj/machinery/light{ + dir = 4 + }, +/obj/machinery/door/window/southright{ + dir = 1; + name = "shower door" + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room4) "IZ" = ( /obj/structure/window/reinforced{ dir = 1 @@ -11749,6 +12106,9 @@ dir = 4; pixel_x = -30 }, +/obj/structure/bed/chair/sofa/corp/left{ + dir = 4 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "JB" = ( @@ -11905,11 +12265,6 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "JY" = ( -/obj/structure/bed/double/padded, -/obj/item/weapon/bedsheet/clowndouble, -/obj/structure/cable/yellow{ - icon_state = "4-8" - }, /turf/simulated/floor/wood, /area/groundbase/dorms/room4) "JZ" = ( @@ -11921,9 +12276,18 @@ }, /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) +"Ka" = ( +/obj/structure/table/woodentable, +/obj/random/donkpocketbox, +/obj/structure/cable/yellow{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 4 + }, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room6) "Kc" = ( -/obj/item/weapon/bedsheet/browndouble, -/obj/structure/bed/double/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, @@ -12017,7 +12381,7 @@ /area/groundbase/cargo/office) "Kj" = ( /obj/structure/table/woodentable, -/obj/random/donkpocketbox, +/obj/machinery/microwave, /turf/simulated/floor/wood, /area/groundbase/dorms/room5) "Kk" = ( @@ -12048,12 +12412,17 @@ /turf/simulated/floor/outdoors/sidewalk/slab/virgo3c, /area/groundbase/cargo/bay) "Kn" = ( -/obj/structure/disposalpipe/segment{ - dir = 4; - icon_state = "pipe-c" +/obj/structure/sink{ + pixel_y = 20 }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room2) +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/machinery/alarm{ + dir = 4 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room3) "Kp" = ( /obj/machinery/recharge_station, /turf/simulated/floor/tiled/dark, @@ -12109,11 +12478,8 @@ /turf/simulated/floor/tiled/steel_ridged, /area/groundbase/command/bridge) "Kx" = ( -/obj/machinery/newscaster{ - pixel_y = 28 - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/chapel) +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room3) "Ky" = ( /obj/structure/sink{ dir = 8; @@ -12369,13 +12735,14 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/recharger{ + pixel_y = 5 + }, /turf/simulated/floor/tiled, /area/groundbase/science/robotics) "Lp" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room2) +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room4) "Lq" = ( /obj/structure/bed/chair/sofa/bench{ dir = 1 @@ -12640,7 +13007,7 @@ /area/medical/virology) "LZ" = ( /obj/structure/table/woodentable, -/obj/random/donkpocketbox, +/obj/machinery/microwave, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) "Mb" = ( @@ -12782,14 +13149,11 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) "Mr" = ( -/obj/machinery/firealarm{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" }, -/obj/structure/disposalpipe/trunk{ - dir = 4 - }, -/obj/machinery/disposal, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room1) "Ms" = ( /obj/machinery/portable_atmospherics/canister/oxygen, @@ -13365,15 +13729,17 @@ /turf/simulated/floor/tiled, /area/groundbase/science/hall) "NZ" = ( -/obj/machinery/power/apc{ - dir = 4; - nightshift_setting = 2 +/obj/structure/mirror{ + pixel_y = 37 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" +/obj/structure/sink{ + pixel_y = 20 }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room6) +/obj/machinery/alarm{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room4) "Oa" = ( /obj/structure/disposalpipe/segment{ dir = 4 @@ -13563,15 +13929,12 @@ /turf/simulated/floor/tiled, /area/groundbase/civilian/hydroponics) "OB" = ( -/obj/machinery/power/apc{ - dir = 4; - nightshift_setting = 2 +/obj/machinery/light, +/obj/structure/toilet{ + dir = 4 }, -/obj/structure/cable/yellow{ - icon_state = "0-8" - }, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room2) +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room3) "OC" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, @@ -13621,7 +13984,7 @@ /turf/simulated/floor/virgo3c{ edge_blending_priority = -1 }, -/area/groundbase/level2/nw) +/area/groundbase/level2/northspur) "OJ" = ( /obj/structure/cable/yellow{ icon_state = "4-8" @@ -13670,8 +14033,12 @@ /turf/simulated/floor/tiled, /area/groundbase/science/robotics) "OR" = ( -/obj/structure/table/woodentable, -/obj/machinery/microwave, +/obj/machinery/firealarm{ + dir = 8 + }, +/obj/structure/closet/secure_closet/personal, +/obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room3) "OS" = ( @@ -13841,10 +14208,8 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/command/hall) "Ps" = ( -/obj/structure/bed/chair/sofa/corp/right, -/obj/machinery/atmospherics/unary/vent_pump/on, -/obj/machinery/light{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 10 }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) @@ -14015,6 +14380,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bed/chair/sofa/corp/left{ + dir = 8 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "PU" = ( @@ -14381,15 +14749,8 @@ /turf/simulated/floor/tiled, /area/groundbase/science/xenobot) "QQ" = ( -/obj/structure/closet/wardrobe/chaplain_black, -/obj/item/weapon/storage/fancy/crayons, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/item/weapon/flame/candle/candelabra, -/obj/machinery/light_switch{ - dir = 1; - pixel_y = -30 +/obj/structure/cable/yellow{ + icon_state = "1-8" }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) @@ -14700,9 +15061,9 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/triage) "RK" = ( -/obj, -/turf/simulated/open/virgo3c, -/area/groundbase/level2/northspur) +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/groundbase/dorms/room3) "RL" = ( /turf/simulated/floor/outdoors/newdirt/virgo3c, /area/groundbase/level2/sw) @@ -15344,9 +15705,12 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "Tx" = ( -/obj/structure/disposalpipe/segment{ - dir = 1; - icon_state = "pipe-c" +/obj/machinery/disposal, +/obj/structure/disposalpipe/trunk{ + dir = 4 + }, +/obj/machinery/firealarm{ + dir = 8 }, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) @@ -15359,6 +15723,13 @@ }, /turf/simulated/floor/tiled, /area/groundbase/science/circuits) +"Tz" = ( +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/dorms/room7) "TB" = ( /obj/structure/sign/painting/library_secure{ pixel_y = -30 @@ -15400,10 +15771,9 @@ /turf/simulated/floor/outdoors/grass/virgo3c, /area/groundbase/cargo/bay) "TJ" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, +/obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/groundbase/dorms/room5) +/area/groundbase/dorms/room4) "TL" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -15549,11 +15919,12 @@ /turf/simulated/floor/reinforced, /area/rnd/xenobiology) "Uk" = ( -/obj/structure/bed/chair/sofa/corp/left, -/obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/light{ dir = 1 }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 6 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "Um" = ( @@ -15584,6 +15955,18 @@ }, /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) +"Uq" = ( +/obj/structure/mirror{ + pixel_y = 37 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/machinery/alarm{ + dir = 8 + }, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room6) "Ur" = ( /turf/simulated/floor/tiled/white, /area/groundbase/medical/Chemistry) @@ -15709,8 +16092,12 @@ "UN" = ( /obj/structure/closet/secure_closet/personal, /obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, +/obj/machinery/firealarm{ + dir = 4 + }, /turf/simulated/floor/wood, -/area/groundbase/dorms/room6) +/area/groundbase/dorms/room4) "UQ" = ( /obj/machinery/door/blast/regular{ density = 0; @@ -15893,10 +16280,11 @@ /turf/simulated/floor/carpet, /area/groundbase/civilian/library) "Vq" = ( -/obj/machinery/firealarm{ - dir = 8 +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room5) "Vr" = ( /turf/simulated/floor/tiled, @@ -15951,6 +16339,9 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/bed/chair/sofa/corp/right{ + dir = 4 + }, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) "Vz" = ( @@ -16073,14 +16464,12 @@ /turf/simulated/floor/carpet, /area/groundbase/civilian/chapel) "VT" = ( -/obj/machinery/power/apc{ - dir = 1 +/obj/structure/toilet{ + dir = 8 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" - }, -/turf/simulated/floor/tiled/dark, -/area/groundbase/civilian/chapel) +/obj/machinery/light, +/turf/simulated/floor/tiled/white, +/area/groundbase/dorms/room4) "VV" = ( /obj/structure/disposalpipe/segment{ dir = 1; @@ -16089,12 +16478,7 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "VW" = ( -/obj/structure/bed/chair/wood{ - dir = 1 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 8 - }, +/obj/structure/table/woodentable, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "VX" = ( @@ -16148,14 +16532,12 @@ /area/groundbase/science/xenobot/storage) "Wa" = ( /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "2-4" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment{ - dir = 2; - icon_state = "pipe-c" - }, /turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "Wb" = ( @@ -16495,14 +16877,14 @@ /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) "Xf" = ( -/obj/machinery/power/apc{ - dir = 1 +/obj/machinery/shower{ + pixel_y = 16 }, -/obj/structure/cable/yellow{ - icon_state = "0-2" +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" }, -/turf/simulated/floor/lino, -/area/groundbase/civilian/chapel/office) +/area/groundbase/dorms/room5) "Xg" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/hidden/supply, @@ -16514,18 +16896,16 @@ /turf/simulated/floor/tiled, /area/groundbase/cargo/office) "Xh" = ( -/obj/machinery/door/firedoor, -/obj/machinery/door/airlock{ - name = "Chapel Office"; - req_access = list(27) - }, /obj/structure/cable/yellow{ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/disposalpipe/segment, -/turf/simulated/floor/tiled/steel_ridged, +/obj/structure/disposalpipe/segment{ + dir = 2; + icon_state = "pipe-c" + }, +/turf/simulated/floor/lino, /area/groundbase/civilian/chapel/office) "Xi" = ( /obj/effect/floor_decal/chapel{ @@ -16555,6 +16935,13 @@ /obj/item/weapon/cartridge/signal/science, /turf/simulated/floor/tiled, /area/groundbase/science/rd) +"Xp" = ( +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" + }, +/turf/simulated/floor/tiled/steel_ridged, +/area/groundbase/dorms/room8) "Xq" = ( /obj/machinery/vending/nifsoft_shop, /turf/simulated/floor/tiled, @@ -16684,6 +17071,9 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled/dark, /area/groundbase/dorms) +"XL" = ( +/turf/simulated/wall, +/area/groundbase/dorms/room8) "XM" = ( /obj/machinery/door/firedoor, /obj/machinery/door/airlock/glass_command{ @@ -16720,6 +17110,15 @@ }, /turf/simulated/floor/wood, /area/groundbase/civilian/library) +"XS" = ( +/obj/machinery/alarm{ + pixel_y = 28 + }, +/obj/machinery/light{ + dir = 8 + }, +/turf/simulated/floor/tiled/dark, +/area/groundbase/civilian/chapel) "XT" = ( /obj/effect/floor_decal/industrial/warning{ dir = 8 @@ -16920,6 +17319,9 @@ dir = 4 }, /obj/machinery/light, +/obj/structure/closet/secure_closet/personal, +/obj/item/weapon/towel/random, +/obj/item/weapon/storage/backpack, /turf/simulated/floor/wood, /area/groundbase/dorms/room1) "Yz" = ( @@ -16936,10 +17338,11 @@ /turf/simulated/floor/tiled/eris/cafe, /area/groundbase/civilian/kitchen) "YF" = ( -/obj/machinery/firealarm{ - dir = 4 +/obj/machinery/door/airlock{ + id_tag = null; + name = "Bathroom" }, -/turf/simulated/floor/wood, +/turf/simulated/floor/tiled/steel_ridged, /area/groundbase/dorms/room6) "YG" = ( /obj/effect/floor_decal/industrial/warning/corner{ @@ -17065,6 +17468,8 @@ /area/groundbase/cargo/office) "Za" = ( /obj/machinery/light, +/obj/structure/bed/double/padded, +/obj/item/weapon/bedsheet/browndouble, /turf/simulated/floor/wood, /area/groundbase/dorms/room6) "Zb" = ( @@ -17128,8 +17533,6 @@ /turf/simulated/floor/carpet/deco, /area/groundbase/civilian/kitchen/backroom) "Zk" = ( -/obj/item/weapon/bedsheet/browndouble, -/obj/structure/bed/double/padded, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /turf/simulated/floor/wood, /area/groundbase/dorms/room2) @@ -17231,10 +17634,14 @@ /turf/simulated/floor/tiled/white, /area/groundbase/medical/lobby) "ZC" = ( -/obj/structure/closet/secure_closet/personal, -/obj/item/weapon/towel/random, -/turf/simulated/floor/wood, -/area/groundbase/dorms/room1) +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/curtain/open/shower, +/turf/simulated/floor/tiled{ + icon_state = "techmaint" + }, +/area/groundbase/dorms/room6) "ZD" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 @@ -17296,8 +17703,11 @@ /turf/simulated/wall/r_wall, /area/groundbase/science/xenobot) "ZM" = ( +/obj/machinery/power/apc{ + dir = 1 + }, /obj/structure/cable/yellow{ - icon_state = "1-2" + icon_state = "0-2" }, /turf/simulated/floor/tiled/dark, /area/groundbase/civilian/chapel) @@ -21406,7 +21816,7 @@ Ny Ny LS LS -LS +kX LS LS Ny @@ -22356,20 +22766,20 @@ fX xE xE xE +Gk +Gk +Gk +Gk xE +kH +kH +kH +kH xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE +CB +CB +CB +CB xE xE xE @@ -22496,22 +22906,22 @@ ON (37,1,1) = {" fX xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE +Gk +Gk +Gk +le +wk +Gk +kH +kH +Kn +OB +kH +CB +CB +Gg +Fr +CB xE xE xE @@ -22639,20 +23049,20 @@ ON fX xE Gk +co +eu +mU +mU Gk -Gk -Gk -Gk -Gk +BX +ED +Kx +Kx kH -kH -kH -kH -kH -CB -CB -CB -CB +Xf +mf +Bc +Bc CB xE xE @@ -22781,20 +23191,20 @@ ON fX xE Gk -eU -IY -Mr -ZC Gk -OR -co -oE -Im +Gk +Mr +Gk +Gk kH -yC -Ho +kH +oE +kH +kH +CB +CB Vq -TJ +CB CB xE xE @@ -22903,7 +23313,7 @@ Ov PR lw Vr -Vr +pT XX XX aa @@ -22924,19 +23334,19 @@ fX xE Gk rc -OJ -BX +eU +VK Tx Gk oL -wu -kC +Ho kC +OR kH Kj -Jh -Ec +Io Ec +dB CB xE xE @@ -23085,10 +23495,10 @@ jn jn jn jn -xE -bY -bY -xE +jn +jn +jn +jn rP Ce MY @@ -23215,22 +23625,22 @@ Gk XD wu ky -kC +RK kH jp Jh LC -Ec +Ht CB GF kY cQ ax jn -xE -bY -bY -xE +vq +HV +vi +jn rP mG JF @@ -23368,11 +23778,11 @@ VN xi ZU ZU +Tz +uf +uf +pO jn -bY -bY -bY -bY rP rP rP @@ -23511,13 +23921,13 @@ xi mw rm jn -bY -Jc -Jc -bY -Jc -bY -bY +jn +jn +jn +jn +xE +xE +xE LT bX bY @@ -23653,12 +24063,12 @@ lN sM ZU jn -bY -Jc -Jc -Jc -Jc -Jc +xE +xE +xE +xE +xE +xE Jc bY bX @@ -23795,9 +24205,9 @@ Bj dI yy jn -bY -Jc -Jc +xE +xE +xE Jc Jc Jc @@ -24090,12 +24500,12 @@ mm Da bY bY -bY -bY -bY -bY -bY -bY +Jc +Jc +Jc +Jc +Jc +Jc bY bY Vk @@ -24233,7 +24643,7 @@ bY bY bY bY -Jc +bY bY bY bY @@ -24365,7 +24775,7 @@ uk bN xE xE -zs +xE zs FN Rs @@ -24507,9 +24917,9 @@ CE bN xE xE +xE zs -jq -hy +XS eD CZ lA @@ -24647,10 +25057,10 @@ Uz jc jP bN -xE -xE +bN +bN +bN zs -VT ZM Qw ZP @@ -24788,12 +25198,12 @@ qH Uz CE CE -bN -xE -xE +Xp +gS +gS +uH zs -rD -eD +fh Tc Ym wB @@ -24917,25 +25327,25 @@ PV tV jC EN -aP +HI sL -aP +TJ dS Pq jQ aI -zE +wo LP nA HK RD -CE +rX bN -xE -xE +st +vw +mI zs -eu -eD +fv Ds Ib Qp @@ -25073,10 +25483,10 @@ bN bN bN bN -ME -ME -ME -eD +XL +XL +XL +zs eD QZ RH @@ -25196,29 +25606,29 @@ fX xE jC AY -dz -Kn +jq +PV fO jC aP -aP +Im JY -aP +UN dS LZ -jQ -zE +Ka zE +vK LP xE xE +xE ME -ED df zG lI -ME -wk +IF +zs eD YH VS @@ -25337,30 +25747,30 @@ ON fX xE jC -nv -OB -ai -Lp jC -HI -cI -tP -HI +jC +ai +jC +jC dS -mU -NZ +dS +tP +dS +dS +LP +LP YF -UN +LP LP xE xE +xE ME -jx Cl VW gA -ME -eu +IS +zs eD YH Nj @@ -25479,30 +25889,30 @@ ON fX xE jC +cI +jx +nv +nv jC -jC -jC -jC -jC -dS -dS -dS -dS +DN +IY +Lp +Lp dS +ZC +rR +pr +pr LP -LP -LP -LP -LP +xE xE xE ME -le eO gq Wa Xh -Eh +pU Eh Lg Rb @@ -25620,31 +26030,31 @@ ON (59,1,1) = {" fX xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE -xE +jC +jC +jC +rD +yC +jC +dS +dS +NZ +VT +dS +LP +LP +Uq +oj +LP xE xE xE ME -Xf fj bk QQ -ME -eD +rp +zs eD eD eD @@ -25764,29 +26174,29 @@ fX xE xE xE +jC +jC +jC +jC xE -xE -xE -xE -xE -xE -xE -xE +dS +dS +dS +dS VR -VR -VR -VR -xE +LP +LP +LP +LP bY bY bY ME -DN cA mJ sU -ME -Kx +ma +zs zS eD eD @@ -25922,12 +26332,12 @@ VR VR VR bY +bY ME ME Iq Iq ME -ME zs zs hM @@ -26218,7 +26628,7 @@ bY bY bY bY -bY +Jc bY bY VR @@ -26792,7 +27202,7 @@ VR VR VR VR -RK +VR VR VR bY @@ -29531,7 +29941,7 @@ oH oH oH oH -oH +QD Bo Bo Qc @@ -29673,7 +30083,7 @@ oH oH oH oH -oH +QD Bo Bo Bo diff --git a/maps/groundbase/gb-z3.dmm b/maps/groundbase/gb-z3.dmm index ea3c975eb1..22bcf4d214 100644 --- a/maps/groundbase/gb-z3.dmm +++ b/maps/groundbase/gb-z3.dmm @@ -4517,8 +4517,8 @@ Zo Zo Zo Zo -Kr -Kr +QD +QD Zo Zo Zo @@ -8436,7 +8436,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -8578,7 +8578,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -8720,7 +8720,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -8862,7 +8862,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -9004,7 +9004,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -9146,7 +9146,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -9288,7 +9288,7 @@ kU kU kU kU -pf +kU pf pf pf @@ -11163,7 +11163,7 @@ Zo Zo Zo Zo -QD +Zo QD QD QD @@ -11297,11 +11297,12 @@ Zo Zo Zo Zo +vs Kr -Kr -Kr -Kr +vs +vs Zo +vs Kr Kr Kr @@ -11325,7 +11326,6 @@ QD QD QD QD -QD Kr Kr Kr @@ -11447,7 +11447,7 @@ Kr Kr Kr Kr -QD +Kr QD QD QD diff --git a/maps/groundbase/groundbase_areas.dm b/maps/groundbase/groundbase_areas.dm index b0cfd55191..9616c82b1b 100644 --- a/maps/groundbase/groundbase_areas.dm +++ b/maps/groundbase/groundbase_areas.dm @@ -112,7 +112,7 @@ /area/groundbase/science/rnd name = "Research and Development" /area/groundbase/science/robotics - name = "Rocotics" + name = "Robotics" /area/groundbase/science/server name = "Science Server Room" /area/groundbase/science/rd @@ -370,6 +370,14 @@ /area/groundbase/civilian/gameroom name = "Gamatorium" sound_env = SMALL_SOFTFLOOR +/area/groundbase/civilian/mensrestroom + name = "Men's Restroom" + sound_env = SOUND_ENVIRONMENT_BATHROOM + lightswitch = 1 +/area/groundbase/civilian/womensrestroom + name = "Women's Restroom" + sound_env = SOUND_ENVIRONMENT_BATHROOM + lightswitch = 1 /area/groundbase/exploration name = "Exploration" diff --git a/maps/groundbase/pois/outdoors4.dmm b/maps/groundbase/pois/outdoors4.dmm index f55b86c27a..2a9c33e717 100644 --- a/maps/groundbase/pois/outdoors4.dmm +++ b/maps/groundbase/pois/outdoors4.dmm @@ -31,7 +31,7 @@ /turf/simulated/floor/wood, /area/groundbase/poi/outdoor/cabin1) "l" = ( -/obj/structure/bed/chair/sofa/right{ +/obj/structure/bed/chair/sofa/right/black{ dir = 4 }, /turf/simulated/floor/wood, @@ -54,7 +54,7 @@ /turf/simulated/floor/wood, /area/groundbase/poi/outdoor/cabin1) "K" = ( -/obj/structure/bed/chair/sofa/left, +/obj/structure/bed/chair/sofa/left/black, /turf/simulated/floor/wood, /area/groundbase/poi/outdoor/cabin1) "O" = ( @@ -75,7 +75,7 @@ /turf/simulated/wall/wood, /area/groundbase/poi/outdoor/cabin1) "Z" = ( -/obj/structure/bed/chair/sofa/corner{ +/obj/structure/bed/chair/sofa/corner/black{ dir = 1 }, /turf/simulated/floor/wood, diff --git a/maps/groundbase/pois/outdoors5.dmm b/maps/groundbase/pois/outdoors5.dmm index fba10bd781..198ed3046f 100644 --- a/maps/groundbase/pois/outdoors5.dmm +++ b/maps/groundbase/pois/outdoors5.dmm @@ -50,11 +50,11 @@ /turf/simulated/floor/wood, /area/groundbase/poi/outdoor/cabin2) "L" = ( -/obj/structure/bed/chair/sofa/right, +/obj/structure/bed/chair/sofa/right/black, /turf/simulated/floor/wood, /area/groundbase/poi/outdoor/cabin2) "O" = ( -/obj/structure/bed/chair/sofa/left, +/obj/structure/bed/chair/sofa/left/black, /turf/simulated/floor/wood, /area/groundbase/poi/outdoor/cabin2) "T" = ( diff --git a/maps/stellardelight/ship_centcom.dmm b/maps/stellardelight/ship_centcom.dmm index d4a17d3218..23be338ccd 100644 --- a/maps/stellardelight/ship_centcom.dmm +++ b/maps/stellardelight/ship_centcom.dmm @@ -5148,13 +5148,13 @@ /turf/unsimulated/floor/techfloor_grid, /area/centcom/evac) "uC" = ( -/obj/machinery/computer/shuttle_control/emergency{ - dir = 8 - }, /obj/machinery/light/floortube{ dir = 4; pixel_x = 6 }, +/obj/machinery/computer{ + dir = 8 + }, /turf/simulated/shuttle/floor, /area/centcom/terminal) "uD" = ( @@ -5209,8 +5209,8 @@ /turf/simulated/shuttle/floor, /area/shuttle/escape) "uT" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/ion_engine{ + dir = 4 }, /turf/simulated/shuttle/plating, /area/centcom/terminal) @@ -6662,6 +6662,16 @@ }, /turf/simulated/floor/tiled/steel_grid, /area/centcom/terminal) +"CP" = ( +/obj/machinery/door/airlock/angled_bay/external/glass{ + dir = 4; + door_color = "#822a1e"; + frequency = null; + id_tag = null; + locked = 1 + }, +/turf/simulated/shuttle/floor/yellow, +/area/centcom/terminal) "CR" = ( /obj/machinery/porta_turret/crescent{ density = 1 @@ -20347,7 +20357,7 @@ dm dm wb wb -dm +CP wb wb dm diff --git a/maps/stellardelight/ship_misc.dmm b/maps/stellardelight/ship_misc.dmm index c4d31e03d1..bb8e4f8aff 100644 --- a/maps/stellardelight/ship_misc.dmm +++ b/maps/stellardelight/ship_misc.dmm @@ -2971,9 +2971,9 @@ }, /area/holodeck/source_gym) "PL" = ( -/turf/simulated/floor/holofloor/reinforced, -/turf/simulated/floor/flesh, -/area/holodeck/the_uwu_zone) +/turf/space, +/turf/space, +/area/space) "PM" = ( /turf/simulated/floor/smole/megablocks, /area/holodeck/source_smoleworld) @@ -10567,16 +10567,16 @@ Me Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -10709,16 +10709,16 @@ Me Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -10851,16 +10851,16 @@ PM Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -10993,16 +10993,16 @@ PM Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -11135,16 +11135,16 @@ PM Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -11277,16 +11277,16 @@ PM Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -11419,16 +11419,16 @@ PM Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -11561,16 +11561,16 @@ PM Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -11703,16 +11703,16 @@ Me Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -11845,16 +11845,16 @@ Me Me Me dB -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ -fZ +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly xp ap ap @@ -16815,16 +16815,16 @@ fz fz fS dB -Ly -Ly -Ly -Ly +ap +ap +ap +ap PL -Ly -Ly -Ly +ap +ap +ap PL -Ly +ap xp ap ap @@ -16957,16 +16957,16 @@ ei ei fJ dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -17099,16 +17099,16 @@ fJ fz fS dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -17241,16 +17241,16 @@ fJ ei fT dB -Ly -Ly -Ly -Ly +ap +ap +ap +ap PL -Ly -Ly -Ly +ap +ap +ap PL -Ly +ap xp ap ap @@ -17383,16 +17383,16 @@ fJ fA fU dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -17525,16 +17525,16 @@ ei ei fJ dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -17667,16 +17667,16 @@ fA fA fU dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -17809,16 +17809,16 @@ bh aG aG dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -17951,16 +17951,16 @@ dJ dK dK dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap @@ -18093,16 +18093,16 @@ dJ dJ dJ dB -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly -Ly +ap +ap +ap +ap +ap +ap +ap +ap +ap +ap xp ap ap diff --git a/maps/tether/submaps/tether_centcom.dmm b/maps/tether/submaps/tether_centcom.dmm index dc44a86f1a..bd6de68333 100644 --- a/maps/tether/submaps/tether_centcom.dmm +++ b/maps/tether/submaps/tether_centcom.dmm @@ -4652,8 +4652,8 @@ /turf/simulated/floor/tiled, /area/centcom/main_hall) "qV" = ( -/obj/structure/shuttle/engine/propulsion{ - dir = 8 +/obj/machinery/ion_engine{ + dir = 4 }, /turf/simulated/shuttle/plating, /area/centcom/terminal) @@ -5769,7 +5769,7 @@ /turf/simulated/floor/tiled/white, /area/centcom/bathroom) "xj" = ( -/obj/machinery/computer/shuttle_control/emergency{ +/obj/machinery/computer{ dir = 8 }, /obj/machinery/light/floortube{ @@ -5955,6 +5955,16 @@ /area/centcom/security{ name = "\improper CentCom Security Arrivals" }) +"ya" = ( +/obj/machinery/door/airlock/angled_bay/external/glass{ + dir = 4; + door_color = "#822a1e"; + frequency = null; + id_tag = null; + locked = 1 + }, +/turf/simulated/shuttle/floor/yellow, +/area/centcom/terminal) "yb" = ( /obj/machinery/conveyor{ dir = 4; @@ -20369,7 +20379,7 @@ XL XL Cg Cg -XL +ya Cg Cg XL diff --git a/maps/tether/submaps/tether_misc.dmm b/maps/tether/submaps/tether_misc.dmm index 1815fed268..3f328faef6 100644 --- a/maps/tether/submaps/tether_misc.dmm +++ b/maps/tether/submaps/tether_misc.dmm @@ -2619,9 +2619,6 @@ "Az" = ( /turf/unsimulated/beach/coastline, /area/beach) -"Ba" = ( -/turf/simulated/floor/holofloor/reinforced, -/area/holodeck/the_uwu_zone) "Bi" = ( /obj/structure/table/woodentable/holotable, /obj/effect/landmark/costume/madscientist, @@ -14254,11 +14251,11 @@ bN bN bN bN -Ba bN bN bN -Ba +bN +bN bN fZ ap @@ -14680,11 +14677,11 @@ bN bN bN bN -Ba bN bN bN -Ba +bN +bN bN fZ ap diff --git a/vorestation.dme b/vorestation.dme index 1407e57ab3..f62a27c7fa 100644 --- a/vorestation.dme +++ b/vorestation.dme @@ -1267,6 +1267,7 @@ #include "code\game\objects\items\stacks\nanopaste_vr.dm" #include "code\game\objects\items\stacks\sandbags.dm" #include "code\game\objects\items\stacks\stack.dm" +#include "code\game\objects\items\stacks\stack_vr.dm" #include "code\game\objects\items\stacks\telecrystal.dm" #include "code\game\objects\items\stacks\tickets.dm" #include "code\game\objects\items\stacks\tiles\fifty_spawner_tiles.dm"