diff --git a/code/modules/awaymissions/redgate.dm b/code/modules/awaymissions/redgate.dm index 3de12a5a081..1a426a2acdf 100644 --- a/code/modules/awaymissions/redgate.dm +++ b/code/modules/awaymissions/redgate.dm @@ -185,6 +185,22 @@ /area/redgate/structure/powered requires_power = 0 +/area/redgate/structure/powered/bed1 + name = "Bedroom 1" + requires_power = 0 + +/area/redgate/structure/powered/bed2 + name = "Bedroom 2" + requires_power = 0 + +/area/redgate/structure/powered/bed3 + name = "Bedroom 3" + requires_power = 0 + +/area/redgate/structure/powered/bed4 + name = "Bedroom 4" + requires_power = 0 + /area/redgate/lit dynamic_lighting = 0 diff --git a/maps/redgate/innland.dmm b/maps/redgate/innland.dmm index 2fcb147c7f5..718839604a0 100644 --- a/maps/redgate/innland.dmm +++ b/maps/redgate/innland.dmm @@ -3,6 +3,26 @@ /obj/structure/ghost_pod/ghost_activated/maint_lurker/redgate, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/wilds) +"ab" = ( +/obj/structure/table/marble, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/matches, +/turf/simulated/floor/lino, +/area/redgate/structure/powered) +"ac" = ( +/obj/machinery/light{ + dir = 4 + }, +/turf/unsimulated/floor/steel{ + icon_state = "white" + }, +/area/redgate/structure/powered) +"ad" = ( +/obj/structure/sign/poster{ + dir = 8 + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) "ae" = ( /turf/simulated/floor/beach/sand{ outdoors = 1 @@ -11,22 +31,96 @@ "af" = ( /turf/simulated/wall/wood, /area/redgate/structure/powered) +"ag" = ( +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/whitecandle_box, +/obj/item/storage/fancy/blackcandle_box, +/obj/item/storage/box/matches, +/obj/item/storage/box/matches, +/obj/structure/closet/walllocker_double/kitchen/east{ + name = "Candles" + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) +"ah" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) +"ai" = ( +/obj/machinery/light/small{ + dir = 4 + }, +/turf/simulated/floor/outdoors/grass/seasonal{ + base_desc = "Soft, plush green grass. It feels nice under your feet~" + }, +/area/redgate/structure/powered) "aj" = ( /obj/structure/table/woodentable, /turf/unsimulated/floor/wood, /area/redgate/structure/powered) +"ak" = ( +/obj/machinery/light/small, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) +"al" = ( +/obj/structure/sink/kitchen{ + name = "sink"; + pixel_y = -9; + dir = 1 + }, +/turf/simulated/floor/plating, +/area/redgate/structure/powered) "am" = ( /turf/simulated/floor/carpet/bcarpet, /area/redgate/structure/powered) +"an" = ( +/obj/structure/dummystairs{ + dir = 1 + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) +"ao" = ( +/obj/structure/dummystairs{ + dir = 1 + }, +/obj/effect/map_effect/portal/master/side_a{ + portal_id = "bedrooms"; + name = "main_to_bedrooms" + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) "ap" = ( /turf/unsimulated/floor/wood, /area/redgate/structure/powered) +"aq" = ( +/obj/effect/map_effect/portal/master/side_b{ + name = "bedrooms_to_main"; + portal_id = "bedrooms"; + dir = 1 + }, +/obj/structure/dummystairs{ + dir = 1 + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) "ar" = ( /obj/structure/closet/crate/bin{ anchored = 1 }, /turf/unsimulated/floor/wood, /area/redgate/structure/powered) +"as" = ( +/obj/machinery/light/small{ + dir = 8 + }, +/obj/structure/dummystairs{ + dir = 1 + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) "at" = ( /mob/living/simple_mob/vore/alienanimals/teppi, /turf/simulated/floor/outdoors/grass/seasonal, @@ -35,10 +129,87 @@ /obj/effect/fake_sun, /turf/simulated/mineral/ignore_cavegen, /area/redgate/wilds) +"av" = ( +/turf/simulated/wall/wood, +/area/redgate/structure/powered/bed2) +"aw" = ( +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"ax" = ( +/obj/machinery/light/small, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"ay" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"az" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"aA" = ( +/turf/simulated/wall/wood, +/area/redgate/structure/powered/bed1) +"aB" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aC" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aD" = ( +/obj/machinery/light/small, +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aE" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aF" = ( +/obj/structure/bed/double/padded{ + dir = 1 + }, +/obj/item/bedsheet/bluedouble{ + dir = 1 + }, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) "aG" = ( /obj/structure/flora/pottedplant/fern, /turf/unsimulated/floor/wood, /area/redgate/structure/powered) +"aH" = ( +/obj/machinery/door/airlock{ + name = "Bedroom"; + id_tag = "bedroom1" + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered/bed1) +"aI" = ( +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "bedroom1"; + name = "Door Control"; + pixel_x = -27; + pixel_y = 25; + specialfunctions = 4 + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aJ" = ( +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) "aK" = ( /obj/structure/flora/pottedplant/minitree, /turf/unsimulated/floor/wood, @@ -46,20 +217,194 @@ "aL" = ( /turf/simulated/floor/reinforced, /area/redgate/wilds) -"aM" = ( -/turf/simulated/floor/carpet/purcarpet, -/area/redgate/structure/powered) "aN" = ( /obj/structure/flora/ausbushes/ywflowers, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/wilds) +"aO" = ( +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "bedroom2"; + name = "Door Control"; + pixel_x = 27; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_y = -34; + pixel_x = 27 + }, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"aP" = ( +/obj/machinery/door/airlock{ + name = "Bedroom"; + id_tag = "bedroom2" + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered/bed2) "aQ" = ( /obj/structure/flora/ausbushes/ppflowers, /turf/simulated/floor/outdoors/grass/seasonal, /area/redgate/wilds) +"aR" = ( +/obj/machinery/light_switch{ + dir = 4; + pixel_y = 5; + pixel_x = -27 + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aS" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/reddouble, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aT" = ( +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/matches, +/obj/structure/closet/walllocker_double/kitchen/north{ + name = "Candles" + }, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"aU" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"aV" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"aW" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/carpet/blue, +/area/redgate/structure/powered/bed2) +"aX" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aY" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"aZ" = ( +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/matches, +/obj/structure/closet/walllocker_double/kitchen/north{ + name = "Candles" + }, +/turf/simulated/floor/carpet, +/area/redgate/structure/powered/bed1) +"ba" = ( +/turf/simulated/wall/wood, +/area/redgate/structure/powered/bed4) +"bb" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bc" = ( +/obj/machinery/light/small, +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bd" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"be" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bf" = ( +/turf/simulated/wall/wood, +/area/redgate/structure/powered/bed3) +"bg" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) "bh" = ( /turf/simulated/floor/reinforced, /area/redgate/structure/powered) +"bi" = ( +/obj/structure/closet/crate/bin{ + anchored = 1 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bj" = ( +/obj/machinery/light/small, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bk" = ( +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bl" = ( +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bm" = ( +/obj/machinery/button/remote/airlock{ + dir = 8; + id = "bedroom4"; + name = "Door Control"; + pixel_x = 27; + pixel_y = 25; + specialfunctions = 4 + }, +/obj/machinery/light_switch{ + dir = 8; + pixel_y = 35; + pixel_x = 27 + }, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bn" = ( +/obj/machinery/door/airlock{ + name = "Bedroom"; + id_tag = "bedroom4" + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered/bed4) +"bo" = ( +/obj/structure/bed/double/padded, +/obj/item/bedsheet/purpledouble, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bp" = ( +/obj/structure/bed/double/padded{ + dir = 1 + }, +/obj/item/bedsheet/browndouble{ + dir = 1 + }, +/obj/structure/curtain/black, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bq" = ( +/obj/machinery/door/airlock{ + name = "Bedroom"; + id_tag = "bedroom3" + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered/bed3) "br" = ( /obj/structure/redgate/away, /turf/simulated/floor/reinforced, @@ -97,6 +442,36 @@ /obj/machinery/light, /turf/simulated/floor/tiled, /area/redgate/structure/powered) +"bv" = ( +/obj/machinery/button/remote/airlock{ + dir = 4; + id = "bedroom3"; + name = "Door Control"; + pixel_x = -27; + pixel_y = -25; + specialfunctions = 4 + }, +/obj/machinery/light_switch{ + dir = 4; + pixel_y = -34; + pixel_x = -27 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bw" = ( +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/matches, +/obj/structure/closet/walllocker_double/kitchen/north{ + name = "Candles" + }, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bx" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) "by" = ( /obj/structure/bed/chair/wood/wings{ dir = 8 @@ -104,6 +479,35 @@ /obj/machinery/light/small, /turf/unsimulated/floor/wood, /area/redgate/structure/powered) +"bz" = ( +/obj/structure/closet/secure_closet/personal, +/turf/simulated/floor/carpet/brown, +/area/redgate/structure/powered/bed4) +"bA" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/turf/unsimulated/floor/wood, +/area/redgate/structure/powered) +"bB" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 4 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bC" = ( +/obj/machinery/light/small{ + dir = 1 + }, +/obj/structure/table/woodentable, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) +"bD" = ( +/obj/structure/bed/chair/comfy/black{ + dir = 8 + }, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) "bE" = ( /obj/machinery/light/small{ dir = 1 @@ -124,6 +528,14 @@ base_desc = "Thick, green grass... who knows what's hiding in it!" }, /area/redgate/structure/powered) +"bH" = ( +/obj/item/storage/fancy/candle_box, +/obj/item/storage/box/matches, +/obj/structure/closet/walllocker_double/kitchen/north{ + name = "Candles" + }, +/turf/simulated/floor/carpet/purcarpet, +/area/redgate/structure/powered/bed3) "bO" = ( /turf/simulated/mineral/floor/ignore_cavegen/cave{ desc = "It's finely packed dirt. It is soft, and comfortable to walk on."; @@ -266,10 +678,7 @@ /turf/unsimulated/floor/wood, /area/redgate/structure/powered) "dg" = ( -/obj/structure/sink/kitchen{ - name = "sink"; - pixel_y = 20 - }, +/obj/machinery/telecomms/relay/preset/station, /turf/simulated/floor/plating, /area/redgate/structure/powered) "dh" = ( @@ -370,7 +779,6 @@ /area/redgate/structure/powered) "dD" = ( /obj/structure/extinguisher_cabinet{ - dir = 1; pixel_y = 32 }, /turf/unsimulated/floor/wood, @@ -460,8 +868,7 @@ /area/redgate/structure/powered) "dS" = ( /obj/machinery/door/airlock/glass{ - name = "Kitchen"; - req_access = null + name = "Kitchen" }, /turf/unsimulated/floor/steel{ icon_state = "white" @@ -477,8 +884,7 @@ /area/redgate/structure/powered) "dU" = ( /obj/machinery/door/airlock/freezer{ - name = "Kitchen cold room"; - req_access = null + name = "Kitchen cold room" }, /turf/unsimulated/floor/steel{ icon_state = "white" @@ -664,8 +1070,7 @@ /area/redgate/structure/powered) "ez" = ( /obj/machinery/door/airlock/glass{ - name = "Kitchen"; - req_access = null + name = "Kitchen" }, /turf/unsimulated/floor/steel, /area/redgate/structure/powered) @@ -739,7 +1144,9 @@ /turf/simulated/floor/lino, /area/redgate/structure/powered) "eU" = ( -/obj/machinery/vending/boozeomat, +/obj/machinery/vending/boozeomat{ + req_access = null + }, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -763,7 +1170,9 @@ /obj/effect/floor_decal/corner/grey/diagonal{ dir = 4 }, -/obj/structure/closet/secure_closet/freezer/kitchen, +/obj/structure/closet/secure_closet/freezer/kitchen{ + req_access = null + }, /turf/unsimulated/floor/steel{ icon_state = "white" }, @@ -785,7 +1194,7 @@ /obj/machinery/door/airlock{ name = "Tavern" }, -/turf/unsimulated/floor/steel, +/turf/unsimulated/floor/wood, /area/redgate/structure/powered) "ff" = ( /obj/structure/railing{ @@ -851,13 +1260,6 @@ name = "the end" }, /area/redgate/wilds) -"la" = ( -/obj/machinery/light/small{ - dir = 1 - }, -/obj/machinery/telecomms/relay/preset/station, -/turf/simulated/floor/carpet/purcarpet, -/area/redgate/structure/powered) "lb" = ( /turf/simulated/mineral/ignore_cavegen/cave, /area/redgate/wilds) @@ -896,13 +1298,6 @@ /obj/structure/bonfire/permanent, /turf/simulated/floor/reinforced, /area/redgate/structure/powered) -"pX" = ( -/obj/structure/table/woodentable, -/obj/structure/sign/poster{ - dir = 1 - }, -/turf/unsimulated/floor/wood, -/area/redgate/structure/powered) "ub" = ( /turf/simulated/floor/water, /area/redgate/wilds) @@ -1085,18 +1480,18 @@ kw "} (2,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +ba +ba +ba +ba +af +av +av +av +av +af +kw lb lb lb @@ -1227,18 +1622,18 @@ kw "} (3,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bl +bp +bl +bb +af +aT +aw +aF +aw +af +kw lb lb lb @@ -1369,18 +1764,18 @@ kw "} (4,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bw +bl +bl +bc +af +aU +aw +aw +ax +af +kw lb lb lb @@ -1511,18 +1906,18 @@ kw "} (5,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bx +bl +bl +bd +af +aV +aw +aw +ay +af +kw lb lb lb @@ -1653,20 +2048,20 @@ kw "} (6,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bz +bl +bm +be +af +aW +aO +aw +az +af +kw +kw +kw lb lb lb @@ -1795,20 +2190,20 @@ kw "} (7,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +ba +ba +bn +ba +af +av +aP +av +av +af +af +af +kw lb lb lb @@ -1937,20 +2332,20 @@ kw "} (8,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bA +ap +ap +ap +ah +ap +ap +ap +ap +as +aq +af +kw lb lb lb @@ -2079,20 +2474,20 @@ kw "} (9,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bf +bq +bf +bf +af +aA +aA +aH +aA +af +af +af +kw lb lb lb @@ -2221,20 +2616,20 @@ kw "} (10,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bB +bv +bk +bg +af +aX +aR +aI +aB +af +kw +kw +kw lb lb lb @@ -2363,18 +2758,18 @@ kw "} (11,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bC +bk +bk +bi +af +aY +aJ +aJ +aC +af +kw lb lb lb @@ -2505,18 +2900,18 @@ kw "} (12,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bD +bk +bk +bj +af +aZ +aJ +aJ +aD +af +kw lb lb lb @@ -2647,18 +3042,18 @@ kw "} (13,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bH +bk +bo +bk +af +aJ +aS +aJ +aE +af +kw lb lb lb @@ -2789,18 +3184,18 @@ kw "} (14,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +af +bf +bf +bf +bf +af +aA +aA +aA +aA +af +kw lb lb lb @@ -2931,18 +3326,18 @@ kw "} (15,1,1) = {" kw -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb -lb +kw +kw +kw +kw +kw +kw +kw +kw +kw +kw +kw +kw lb lb lb @@ -3396,10 +3791,10 @@ cQ aL br aL -cQ -ct -ct -cQ +ge +ge +ge +ge ge ge cQ @@ -3545,9 +3940,9 @@ cQ ge ge cQ -cQ -af -dA +xW +cR +ad ap ap ap @@ -3686,10 +4081,10 @@ ct cQ ge ge -cQ -cQ -af -pX +ge +ve +fe +ap ap ap dA @@ -3829,9 +4224,9 @@ dd ge dd cQ -cQ -af -dC +ai +cR +ap ap ap eh @@ -4682,13 +5077,13 @@ am af dn ap -ap -ap +ah +ag ap ar aG ep -ex +ab dE eF eT @@ -5249,7 +5644,7 @@ dc Ha df ap -ap +ak af Ug dT @@ -5387,11 +5782,11 @@ ge cQ af af -cR af af -aM -aM +af +ap +ap af dT dT @@ -5528,12 +5923,12 @@ cQ ge cQ cQ -cQ -cQ af -la -aM -aM +ao +an +ah +ap +ap dl dT dT @@ -5670,8 +6065,8 @@ cQ ge ge cQ -cQ -cQ +af +af af af af @@ -5959,7 +6354,7 @@ cQ af dh cy -cy +al dl dK dV @@ -6104,7 +6499,7 @@ dp dv dl dL -dV +ac ed dl dM