diff --git a/maps/redgate/hotsprings.dmm b/maps/redgate/hotsprings.dmm index 6b628b91cab..1e2ac332a05 100644 --- a/maps/redgate/hotsprings.dmm +++ b/maps/redgate/hotsprings.dmm @@ -955,7 +955,7 @@ }, /area/redgate/hotsprings/outdoors) "wL" = ( -/obj/structure/bed/double, +/obj/structure/bed/double/padded, /obj/item/bedsheet/hopdouble, /turf/simulated/floor/carpet/sblucarpet, /area/redgate/hotsprings/house/dorm1) @@ -1088,7 +1088,7 @@ }, /area/redgate/hotsprings/outdoors) "zB" = ( -/obj/structure/bed/double, +/obj/structure/bed/double/padded, /obj/item/bedsheet/hopdouble, /turf/simulated/floor/carpet/sblucarpet, /area/redgate/hotsprings/house/dorm2) @@ -1151,7 +1151,7 @@ /area/redgate/hotsprings/house/lovercave) "AM" = ( /obj/structure/bed/chair/sofa/corner/purp{ - dir = 1 + dir = 4 }, /turf/simulated/floor/carpet/gaycarpet, /area/redgate/hotsprings/house) diff --git a/maps/tether/tether-07-solars.dmm b/maps/tether/tether-07-solars.dmm index 3d9b0f53f95..b830e0f7b84 100644 --- a/maps/tether/tether-07-solars.dmm +++ b/maps/tether/tether-07-solars.dmm @@ -7175,6 +7175,9 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/anomaly_lab) +"ob" = ( +/turf/simulated/wall, +/area/rnd/outpost/breakroom/quarters/dorm2) "oc" = ( /obj/item/radio/intercom{ dir = 4; @@ -7287,7 +7290,8 @@ /area/rnd/outpost/breakroom) "oo" = ( /obj/machinery/door/airlock/research{ - name = "Science Outpost Personal Quarters" + name = "Science Outpost Personal Quarters"; + id_tag = "sci_outpost_dormdoor2" }, /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7296,8 +7300,11 @@ dir = 4 }, /obj/machinery/door/firedoor/border_only, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "op" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7306,35 +7313,68 @@ dir = 9 }, /obj/machinery/light, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/obj/machinery/button/remote/airlock{ + id = "sci_outpost_dormdoor1"; + name = "Outpost Quarters Lock"; + pixel_x = -13; + pixel_y = -23; + specialfunctions = 4; + dir = 1 + }, +/obj/machinery/button/windowtint{ + id = "sci_outpost_dorms1"; + layer = 3.3; + name = "Window Tint Control"; + pixel_x = -6; + pixel_y = -23; + range = 10 + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm1) "oq" = ( -/obj/structure/bed/double, +/obj/structure/bed/double/padded, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm1) "or" = ( -/obj/structure/bed, +/obj/structure/bed/double/padded, +/obj/item/bedsheet/purpledouble, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "os" = ( -/obj/structure/window/basic/full, -/obj/structure/window/basic{ - dir = 4 +/obj/structure/window/reinforced/polarized/full{ + id = "sci_outpost_dorms2"; + name = "Tintable Window" + }, +/obj/structure/window/reinforced/polarized{ + dir = 4; + id = "sci_outpost_dorms2" }, /obj/structure/grille, /obj/machinery/door/firedoor/glass, /turf/simulated/floor/tiled, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "ot" = ( /obj/structure/table/woodentable, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "ou" = ( /obj/structure/bed/chair/comfy/brown{ dir = 4 }, +/obj/structure/cable/green{ + icon_state = "0-2" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm1) "ov" = ( /obj/machinery/atmospherics/unary/vent_pump/on, /obj/machinery/alarm{ @@ -7344,8 +7384,13 @@ /obj/machinery/firealarm{ pixel_y = 25 }, +/obj/machinery/button/remote/airlock/release{ + pixel_y = 24; + pixel_x = -14; + id = "sci_outpost_dormdoor1" + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm1) "ow" = ( /obj/structure/window/reinforced{ dir = 4 @@ -7362,8 +7407,24 @@ pixel_x = -22 }, /obj/machinery/light, +/obj/machinery/button/remote/airlock{ + id = "sci_outpost_dormdoor2"; + name = "Outpost Quarters Lock"; + pixel_x = -13; + pixel_y = -23; + specialfunctions = 4; + dir = 1 + }, +/obj/machinery/button/windowtint{ + id = "sci_outpost_dorms2"; + layer = 3.3; + name = "Window Tint Control"; + pixel_x = -6; + pixel_y = -23; + range = 10 + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "oy" = ( /obj/machinery/atmospherics/unary/vent_scrubber/on{ dir = 8 @@ -7372,8 +7433,15 @@ dir = 1; pixel_y = -24 }, +/obj/structure/cable/green{ + icon_state = "1-8" + }, +/obj/structure/privacyswitch{ + pixel_y = -22; + pixel_x = 6 + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm1) "oz" = ( /obj/structure/bed/chair/comfy/brown{ dir = 4 @@ -7381,8 +7449,16 @@ /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 10 }, +/obj/structure/cable/green{ + icon_state = "0-8" + }, +/obj/machinery/power/apc{ + dir = 1; + name = "north bump"; + pixel_y = 28 + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "oA" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -7393,8 +7469,16 @@ /obj/machinery/firealarm{ pixel_y = 25 }, +/obj/machinery/button/remote/airlock/release{ + pixel_y = 24; + pixel_x = -14; + id = "sci_outpost_dormdoor2" + }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "oB" = ( /obj/structure/table/woodentable, /obj/item/storage/box/donut, @@ -7412,6 +7496,40 @@ }, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) +"oE" = ( +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/breakroom) +"oF" = ( +/obj/structure/cable/green{ + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/structure/cable/green{ + icon_state = "1-4" + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/breakroom) +"oG" = ( +/obj/machinery/door/airlock/research{ + name = "Science Outpost Personal Quarters"; + id_tag = "sci_outpost_dormdoor1" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 4 + }, +/obj/machinery/door/firedoor/border_only, +/obj/structure/cable/green{ + icon_state = "4-8" + }, +/turf/simulated/floor/tiled, +/area/rnd/outpost/breakroom/quarters/dorm1) "oH" = ( /obj/structure/table/standard, /obj/machinery/light, @@ -7453,6 +7571,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 6 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "oN" = ( @@ -7490,8 +7611,12 @@ dir = 1; pixel_y = -24 }, +/obj/structure/privacyswitch{ + pixel_y = -22; + pixel_x = 6 + }, /turf/simulated/floor/wood, -/area/rnd/outpost/breakroom) +/area/rnd/outpost/breakroom/quarters/dorm2) "oR" = ( /obj/structure/extinguisher_cabinet{ dir = 1; @@ -7586,6 +7711,9 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/structure/cable/green{ + icon_state = "4-8" + }, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) "pd" = ( @@ -7595,8 +7723,31 @@ /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 1 }, +/obj/structure/cable/green{ + icon_state = "1-4" + }, /turf/simulated/floor/tiled, /area/rnd/outpost/breakroom) +"pe" = ( +/obj/structure/window/reinforced/polarized/full{ + id = "sci_outpost_dorms1"; + name = "Tintable Window" + }, +/obj/structure/window/reinforced/polarized{ + dir = 4; + id = "sci_outpost_dorms1" + }, +/obj/structure/grille, +/obj/machinery/door/firedoor/glass, +/turf/simulated/floor/tiled, +/area/rnd/outpost/breakroom/quarters/dorm1) +"pf" = ( +/turf/simulated/wall, +/area/rnd/outpost/breakroom/quarters/dorm1) +"pg" = ( +/obj/structure/table/woodentable, +/turf/simulated/floor/wood, +/area/rnd/outpost/breakroom/quarters/dorm1) "zg" = ( /obj/effect/shuttle_landmark{ base_area = /area/mine/explored; @@ -24380,9 +24531,9 @@ oK oK oK oK -oK +oF oW -on +oE oB oU ab @@ -24662,13 +24813,13 @@ hM hM hM hM -ks -ks +pf +pf +oG +ob oo -ks -oo -ks -ks +ob +ob ab ab ab @@ -24804,13 +24955,13 @@ jf jo ji mV -hM +pf ov op -ks +ob oA ox -ks +ob ab ab ab @@ -24946,13 +25097,13 @@ iV jo ji jF -hM +pf ou oy -ks +ob oz oQ -ks +ob ab ab ab @@ -25088,13 +25239,13 @@ iV jq jA jG -hM -ot +pf +pg oq -ks +ob ot or -ks +ob ab ab ab @@ -25230,13 +25381,13 @@ iC iV jh jH -hM +pf +pe +pe +ob os os -ks -os -os -ks +ob ab ab ab diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm index b3d7319d590..f2b30d5528e 100644 --- a/maps/tether/tether_areas.dm +++ b/maps/tether/tether_areas.dm @@ -818,6 +818,16 @@ name = "\improper Research Outpost Breakroom" icon_state = "research" +/area/rnd/outpost/breakroom/quarters + name = "\improper Research Outpost Personal Quarters" + flags = RAD_SHIELDED | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO + +/area/rnd/outpost/breakroom/quarters/dorm1 + name = "\improper Research Outpost Personal Quarters 1" + +/area/rnd/outpost/breakroom/quarters/dorm2 + name = "\improper Research Outpost Personal Quarters 2" + /area/rnd/outpost/airlock name = "\improper Research Outpost Airlock" icon_state = "green"