From 655afd0dfe94d4d4edf57c34cda367580106f071 Mon Sep 17 00:00:00 2001 From: Chloe Carver-Brown Date: Wed, 24 Mar 2021 12:46:49 +0000 Subject: [PATCH] minor change to psych office --- _maps/map_files/BoxStation/BoxStation.dmm | 104 +++++++++++++--------- 1 file changed, 63 insertions(+), 41 deletions(-) diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 671ac275..551db69b 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -33216,8 +33216,8 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/structure/noticeboard{ - pixel_y = 32 +/obj/machinery/airalarm{ + pixel_y = 23 }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) @@ -33851,10 +33851,6 @@ /area/medical/medbay/central) "bvJ" = ( /obj/machinery/atmospherics/pipe/manifold4w/scrubbers, -/obj/machinery/airalarm{ - dir = 1; - pixel_y = -22 - }, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bvK" = ( @@ -34460,7 +34456,12 @@ /area/quartermaster/storage) "bwX" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/turf/closed/wall, +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "psych_med_window"; + name = "Psychology Privacy Shutters" + }, +/turf/open/floor/plasteel, /area/medical/psych) "bwY" = ( /obj/structure/disposalpipe/segment, @@ -35072,13 +35073,9 @@ /area/medical/psych) "byq" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/white/side, /area/medical/psych) "byr" = ( -/obj/machinery/airalarm{ - pixel_y = 23 - }, /obj/structure/chair/comfy/brown, /turf/open/floor/carpet/green, /area/medical/psych) @@ -35088,9 +35085,12 @@ pixel_x = -4; pixel_y = 14 }, -/obj/item/storage/box/cups{ - pixel_x = 5; - pixel_y = 4 +/obj/machinery/airalarm{ + pixel_y = 23 + }, +/obj/item/folder/white{ + pixel_x = 6; + pixel_y = -1 }, /turf/open/floor/carpet/green, /area/medical/psych) @@ -36308,18 +36308,15 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "bAW" = ( -/obj/machinery/airalarm{ - dir = 8; - pixel_x = 24 - }, -/obj/machinery/light{ - dir = 4 - }, /obj/effect/turf_decal/loading_area{ dir = 4; icon_state = "drain"; name = "drain" }, +/obj/machinery/camera{ + c_tag = "Central Hallway South-East"; + dir = 8 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bAX" = ( @@ -36927,13 +36924,23 @@ "bCl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/wood, -/obj/item/paper_bin{ - pixel_x = 5; - pixel_y = 4 +/obj/machinery/light_switch{ + pixel_x = -7; + pixel_y = -2 }, -/obj/item/folder/white{ - pixel_x = -12; - pixel_y = -1 +/obj/machinery/button/door{ + id = "psych_med_window"; + name = "Medical Window Shutters"; + pixel_x = 5; + pixel_y = 5; + req_access_txt = "71" + }, +/obj/machinery/button/door{ + id = "psych_hall_window"; + name = "Hallway Window Shutters"; + pixel_x = -5; + pixel_y = 5; + req_access_txt = "71" }, /turf/open/floor/plasteel/white/side{ dir = 1 @@ -36947,6 +36954,7 @@ /obj/machinery/light{ light_color = "#cee5d2" }, +/obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/plasteel/white/corner{ dir = 1 }, @@ -36965,6 +36973,10 @@ /obj/structure/table/wood, /obj/structure/cable, /obj/machinery/power/apc/auto_name/south, +/obj/item/paper_bin{ + pixel_x = 5; + pixel_y = 4 + }, /turf/open/floor/carpet/green, /area/medical/psych) "bCp" = ( @@ -37727,6 +37739,10 @@ icon_state = "drain"; name = "drain" }, +/obj/machinery/airalarm{ + dir = 8; + pixel_x = 24 + }, /turf/open/floor/plasteel, /area/hallway/primary/central) "bDJ" = ( @@ -60446,12 +60462,13 @@ /turf/open/floor/plasteel/stairs/left, /area/hallway/primary/central) "cGu" = ( -/obj/machinery/camera{ - c_tag = "Central Hallway South-East"; - dir = 8 +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "psych_med_window"; + name = "Psychology Privacy Shutters" }, -/turf/open/floor/plasteel/stairs/right, -/area/hallway/primary/central) +/turf/open/floor/plasteel, +/area/medical/psych) "cGv" = ( /obj/machinery/power/terminal{ dir = 1 @@ -63182,6 +63199,14 @@ }, /turf/open/floor/plating, /area/maintenance/starboard/aft) +"pis" = ( +/obj/effect/spawner/structure/window/reinforced, +/obj/machinery/door/poddoor/preopen{ + id = "psych_hall_window"; + name = "Psychology Privacy Shutters" + }, +/turf/open/floor/plasteel, +/area/medical/psych) "pkR" = ( /obj/structure/pool/ladder{ dir = 2; @@ -63557,9 +63582,6 @@ /turf/open/floor/wood, /area/security/vacantoffice) "tNb" = ( -/obj/machinery/light_switch{ - pixel_x = -28 - }, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -97186,10 +97208,10 @@ bpQ bsM bMm bWx -bjD -bjD -cGu bAW +axx +aRm +bjD bjD bDI bEG @@ -97445,8 +97467,8 @@ buj bvH byo byo -byo -byo +pis +pis byo byo bxa @@ -98471,7 +98493,7 @@ brl bsP bun bKs -byo +cGu byr bBa jOu