diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 2e23cf937c..a6b4375245 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -643,6 +643,10 @@ }, /turf/open/floor/pod/dark, /area/ruin/lavaland/powered/beach) +"ZH" = ( +/obj/structure/chair/comfy/plywood, +/turf/open/floor/plating/beach/sand, +/area/ruin/lavaland/powered/beach) (1,1,1) = {" aa @@ -824,7 +828,7 @@ ar ar bz ar -bJ +ZH ar bS bT @@ -888,7 +892,7 @@ ar ar ar ar -bJ +ZH bE bR bT @@ -952,7 +956,7 @@ ar ap bx ar -bJ +ZH ar bR bT @@ -1016,7 +1020,7 @@ ar ap ar ar -bJ +ZH ar bR bT @@ -1080,7 +1084,7 @@ ap ar ar ar -bJ +ZH ar bR bT @@ -1144,7 +1148,7 @@ ar ar ar ar -bJ +ZH ar bR bT diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_bathhouse.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_bathhouse.dmm index a231d06d36..10560b15f4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_bathhouse.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_bathhouse.dmm @@ -10,6 +10,11 @@ pixel_y = 16 }, /obj/structure/curtain, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_panel"; + name = "steel pannel" + }, /turf/open/floor/plasteel/white, /area/ruin/lavaland/powered/bathhouse) "e" = ( @@ -19,25 +24,45 @@ /obj/structure/sink{ pixel_y = 20 }, +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_panel"; + name = "steel pannel" + }, /turf/open/floor/plasteel/white, /area/ruin/lavaland/powered/bathhouse) "f" = ( /obj/structure/table/greyscale, /obj/item/bikehorn/rubberducky, +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/obj/machinery/light/small{ + dir = 1 + }, /turf/open/floor/plasteel/white, /area/ruin/lavaland/powered/bathhouse) "g" = ( /turf/open/floor/plasteel/white, /area/ruin/lavaland/powered/bathhouse) "h" = ( -/obj/item/soap, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6; + icon_state = "steel_decals6" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5; + icon_state = "steel_decals6" + }, /turf/open/floor/plasteel/white, /area/ruin/lavaland/powered/bathhouse) "i" = ( /obj/machinery/door/airlock/freezer{ name = "bath house airlock" }, -/turf/open/floor/plasteel/white, +/turf/open/floor/wood, /area/ruin/lavaland/powered/bathhouse) "j" = ( /turf/closed/wall/mineral/wood, @@ -46,8 +71,14 @@ /turf/open/floor/wood, /area/ruin/lavaland/powered/bathhouse) "l" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/meatballspaghetti, +/obj/structure/table/wood/fancy, +/obj/item/reagent_containers/food/drinks/bottle/lizardwine{ + pixel_x = -5 + }, +/obj/item/reagent_containers/food/drinks/drinkingglass{ + pixel_y = 5; + pixel_x = 8 + }, /turf/open/floor/wood, /area/ruin/lavaland/powered/bathhouse) "m" = ( @@ -58,10 +89,113 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "o" = ( -/obj/structure/bed, -/obj/item/bedsheet, +/obj/structure/chair/sofachair{ + dir = 8 + }, +/obj/item/clothing/mask/cigarette/cigar, /turf/open/floor/wood, /area/ruin/lavaland/powered/bathhouse) +"u" = ( +/obj/machinery/shower{ + pixel_y = 16 + }, +/obj/structure/curtain, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/obj/item/soap, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"A" = ( +/obj/structure/mirror{ + pixel_y = 28 + }, +/obj/structure/sink{ + pixel_y = 20 + }, +/obj/effect/turf_decal/loading_area{ + dir = 9; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/obj/effect/turf_decal/loading_area{ + dir = 4; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"B" = ( +/obj/effect/turf_decal/loading_area{ + dir = 1; + icon_state = "drain"; + name = "drain" + }, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"C" = ( +/obj/structure/fireplace{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ruin/lavaland/powered/bathhouse) +"D" = ( +/obj/structure/rack/shelf, +/obj/item/reagent_containers/rag/towel/random, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"K" = ( +/obj/effect/turf_decal/loading_area{ + dir = 5; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/obj/effect/turf_decal/loading_area{ + dir = 10; + icon_state = "steel_panel"; + name = "steel pannel" + }, +/obj/machinery/door/airlock/freezer{ + name = "bath house airlock" + }, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"L" = ( +/obj/structure/rack/shelf, +/obj/item/reagent_containers/rag/towel/random, +/obj/effect/turf_decal/stripes/white/line{ + dir = 6; + icon_state = "steel_decals6" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5; + icon_state = "steel_decals6" + }, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"N" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 6; + icon_state = "steel_decals6" + }, +/obj/effect/turf_decal/stripes/white/line{ + dir = 5; + icon_state = "steel_decals6" + }, +/obj/machinery/light/small{ + dir = 8 + }, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) +"V" = ( +/obj/effect/turf_decal/stripes/white/line{ + dir = 1; + icon_state = "steel_decals4" + }, +/turf/open/floor/plasteel/white, +/area/ruin/lavaland/powered/bathhouse) (1,1,1) = {" b @@ -76,8 +210,8 @@ a (2,1,1) = {" b c -g -g +B +N b j j @@ -86,18 +220,18 @@ j (3,1,1) = {" b b -g -g +B +h i k -k +C j "} (4,1,1) = {" b c -g -g +B +h b l k @@ -106,8 +240,8 @@ j (5,1,1) = {" b b -g -g +B +h b m o @@ -115,9 +249,9 @@ j "} (6,1,1) = {" b -c -g -g +u +B +h b j j @@ -126,7 +260,7 @@ j (7,1,1) = {" b b -g +B h b n @@ -135,9 +269,9 @@ n "} (8,1,1) = {" b -e -g -g +A +V +h b n n @@ -147,8 +281,8 @@ n b e g -g -i +h +K n n n @@ -156,8 +290,8 @@ n (10,1,1) = {" b f -g -g +D +L b n n diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm index 7e45827962..b6a52b0213 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_caloriteshrine.dmm @@ -1,42 +1,58 @@ "aF" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "aG" = (/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "bt" = (/turf/open/floor/mineral/calorite,/area/ruin/unpowered/caloriteshrine) +"ch" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/item/chair/wood,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "cs" = (/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "da" = (/obj/structure/table/wood/fancy,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/statue/fatso{pixel_y = 11},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "de" = (/turf/open/indestructible/cobble/side,/area/lavaland/surface/outdoors) "eF" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 2},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"gI" = (/obj/structure/chair/sofa/right/old,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "hd" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "ho" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) -"kf" = (/obj/structure/table/bronze,/obj/item/trash/sosjerky,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"kf" = (/obj/structure/bonfire,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "kz" = (/obj/structure/table/bronze,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "kB" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 2},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "kF" = (/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"kG" = (/obj/structure/chair/sofa/left/old{dir = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "ly" = (/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "mR" = (/turf/template_noop,/area/template_noop) -"mS" = (/obj/structure/table/bronze,/obj/item/trash/cheesie,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) -"nW" = (/obj/item/trash/soy_food,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"mS" = (/obj/item/trash/waffles,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"nW" = (/obj/structure/chair/wood,/obj/item/clothing/mask/gas/fattening,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "ok" = (/obj/item/trash/cheesie,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"oH" = (/obj/structure/table/bronze,/obj/item/trash/plate{pixel_y = 2},/obj/item/trash/plate{pixel_y = 5},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "pw" = (/obj/structure/mineral_door/calorite,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "pI" = (/obj/effect/decal/cleanable/ash/large,/turf/open/floor/plating/asteroid/basalt,/area/template_noop) "pV" = (/turf/open/floor/plating/asteroid/basalt,/area/template_noop) +"qX" = (/obj/item/borg/upgrade/fatoray,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"rh" = (/obj/structure/table/bronze,/obj/item/trash/plate{pixel_y = 8},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"sa" = (/obj/structure/chair/sofa/old{dir = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"sf" = (/obj/structure/trap/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"sq" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 2},/obj/item/trash/fatoray_scrap1,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "su" = (/obj/structure/chair/wood{dir = 4},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "sA" = (/obj/structure/chair/wood{dir = 8},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "sI" = (/obj/structure/table/bronze,/obj/item/candle/infinite,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "sY" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "tV" = (/obj/structure/chair/wood{dir = 1},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "us" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"uD" = (/obj/item/trash/cheesie,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"uL" = (/obj/structure/chair/sofa/corner/old,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"vN" = (/obj/structure/table/wood/fancy/orange,/obj/item/reagent_containers/food/snacks/burger/rib,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "wt" = (/obj/item/trash/blueberry_gum,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "xI" = (/turf/open/indestructible/cobble/side{dir = 8},/area/lavaland/surface/outdoors) "xY" = (/turf/open/indestructible/cobble,/area/lavaland/surface/outdoors) "yr" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"yG" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow,/obj/structure/trap/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "yR" = (/obj/structure/chair/wood,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "Ad" = (/obj/structure/table/bronze,/obj/item/lighter/gold,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "Aq" = (/turf/closed/wall/mineral/calorite,/area/ruin/unpowered/caloriteshrine) +"AQ" = (/obj/structure/chair/bronze,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"Bz" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/trap/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"CT" = (/obj/machinery/grill,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "FP" = (/obj/item/trash/blueberry_gum,/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "FU" = (/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors) "Go" = (/turf/open/indestructible/cobble/corner{dir = 4},/area/lavaland/surface/outdoors) "IX" = (/obj/item/flashlight/lantern{anchored = 1; icon_state = null; icon = null},/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors) -"Jx" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"Jx" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "JC" = (/obj/item/trash/blueberry_gum,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "LF" = (/turf/open/indestructible/cobble/corner{dir = 8},/area/lavaland/surface/outdoors) "MO" = (/turf/open/indestructible/cobble/side{dir = 4},/area/lavaland/surface/outdoors) @@ -45,7 +61,11 @@ "Oc" = (/obj/item/trash/boritos,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "Pa" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "PY" = (/obj/structure/table/bronze,/obj/item/trash/plate,/obj/item/trash/can,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"QK" = (/obj/structure/table/bronze,/obj/item/trash/plate,/obj/item/trash/plate{pixel_y = 2},/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "QM" = (/obj/effect/turf_decal/tile/yellow,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"QT" = (/obj/structure/table/bronze,/obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz{pixel_y = 7; pixel_x = 8},/obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"RG" = (/obj/item/trash/energybar,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"RV" = (/obj/structure/chair/sofa/corner/old,/obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "Sw" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "SU" = (/obj/item/trash/cheesie,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "Tn" = (/obj/effect/decal/cleanable/ash,/turf/open/floor/plating/asteroid/basalt,/area/template_noop) @@ -54,10 +74,17 @@ "TW" = (/obj/structure/statue/calorite/fatty{anchored = 1},/obj/item/flashlight/lantern{anchored = 1; icon_state = null; icon = null},/turf/open/floor/mineral/calorite/strong,/area/ruin/unpowered/caloriteshrine) "Ul" = (/obj/item/trash/waffles,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "VL" = (/obj/effect/turf_decal/tile/yellow,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"Wa" = (/obj/item/candle/infinite,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) "Wt" = (/obj/effect/decal/cleanable/ash/large,/turf/open/floor/plating/asteroid/basalt,/area/lavaland/surface/outdoors) "Wz" = (/obj/structure/table/bronze,/obj/item/trash/plate,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"WN" = (/obj/structure/table/bronze,/obj/item/reagent_containers/food/drinks/soda_cans/fizzwiz,/turf/open/floor/carpet/red,/area/ruin/unpowered/caloriteshrine) +"XU" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/trap/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"XX" = (/obj/structure/table/wood/fancy/orange,/obj/item/trash/candy,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) "Ye" = (/obj/effect/turf_decal/tile/yellow{dir = 8},/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) -"ZL" = (/obj/structure/table/wood/fancy,/obj/item/candle/infinite,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"Yz" = (/obj/structure/chair/sofa/old,/obj/item/trash/popcorn,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"YM" = (/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/structure/trap/fattening,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"ZL" = (/obj/structure/table/wood/fancy,/obj/effect/turf_decal/tile/yellow{dir = 4},/obj/effect/turf_decal/tile/yellow{dir = 1},/obj/structure/fat_mirror,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) +"ZU" = (/obj/structure/table/wood/fancy/orange,/turf/open/floor/mineral/crimsonstone_floor,/area/ruin/unpowered/caloriteshrine) (1,1,1) = {" mRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmRmR @@ -69,21 +96,21 @@ mRmRmRmRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVpVAqAqAqAqAqAqAqAqAqAqAqpVpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRpVpVpVpVpVAqAqAqAqbtbtbtbtbtbtbtbtbtAqAqAqAqpVpVpVmRmRmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVpVpVAqAqbtbtbtJxSwSwZLdaZLSwSwkBbtbtbtAqAqpVpVpVmRmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVpVpVAqbtYeSwSwkFTWcscscscscsTWaFSwSwkBbtAqTnpVpVmRmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVpVAqAqbthdcscsQMnWPaPaPaPaPaPahocscseFbtAqAqpVpVpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVpVAqAqbtYecscsAqyrlyyRyRlyyRyRlyhdAqcsaFkBbtAqAqpVTnmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRpVTnAqbtwtcscscscsyrlykzWzkzAdkzlyhdSUcscsaFTLbtAqpVpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqAqbthdTWcscscsyrsukzsIkzsIPYsAhdcsOccsTWeFbtAqAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbtYekFcscsSUUlyrsuWzkzkfWzkzsAhdcscscscsaFVLbtAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbthdcsAqcscscsyrsukzWzkzmSkzsAhdcscscsAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbthdcsAqcscscsJCsukzsIkzsIkzsAokcscscsAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqbtushocscscscsyrlykzkzkzWzkzlyhdcscscscsQMaGbtAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVAqAqbthdTWcscsAqyrlytVtVtVtVtVlyhdAqcscsTWyrbtAqAqpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRpVpVpVAqbtushocscscsaFSwSwSwSwSwSwSwkFcscscsQMNrbtAqpVpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVpVpVAqAqbtbtbtJxSwBzZLdaZLBzSwkBbtbtbtAqAqpVpVpVmRmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVpVpVAqbtYeSwSwkFTWcssfsfsfcsTWaFSwSwkBbtAqTnpVpVmRmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVpVAqAqbthdcscsQMPaPaPaPaPaPaPahocscseFbtAqAqpVpVpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVpVAqAqbtYecscsAqyrlynWlyAQlyyRlyhdAqcsYMsqbtAqAqpVTnmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRpVTnAqbtwtcsgIYzuLyrsuWNrhkzAdkzsAhdSUcscsYMTLbtAqpVpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqAqbthdTWZUvNkGyrlykzWaCTWaPYlyhdcsOccsTWeFbtAqAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbtYekFcscsSUUlyrsuQKlykflyoHlyhdcsgIRVcsaFVLbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbthdcsAqcscscsyrlyWzlykfmSQTlychcsXXsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbthdqXAqcscscsJCsukzuDlyWakzlyokcsZUsaAqcsNIbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqbtushocscscscsyrlysIkzlyWzkzsAhdcsZUkGcsQMaGbtAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVAqAqbthdTWcscsAqyrlytVtVlytVtVlyhdAqcscsTWyrbtAqAqpVmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRpVpVpVAqbtushocscscsaFSwSwSwSwSwSwSwkFRGcscsQMNrbtAqpVpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVTnAqAqbtFPPaPaPahoTWcscscscscsTWQMPaPaPasYbtAqAqpVpVmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRpVpVpVpVAqAqbtbtbtbtusPaPahocsQMPaPasYbtbtbtbtAqAqpIpVpVmRmRmRmRmRmRmRmRmR -mRmRmRmRmRmRmRmRmRmRpVpVpVAqAqAqAqAqbtbtbthdcsyrbtbtbtAqAqAqAqAqpVpVTnmRmRmRmRmRmRmRmRmRmR +mRmRmRmRmRmRmRmRmRmRpVpVpVAqAqAqAqAqbtbtbtXUsfyGbtbtbtAqAqAqAqAqpVpVTnmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRpVpVpVpVpVFUAqAqAqAqpwAqpwAqAqAqAqFUpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRmRpVpVpVpVFUFUFUFUTsxIxYMOTsFUFUFUWtpVpVpVpVpVmRmRmRmRmRmRmRmRmRmRmR mRmRmRmRmRmRmRmRmRmRmRmRmRmRmRpVFUFUFUFUIXxIxYMOIXFUFUFUFUpVpVpVmRmRmRmRmRmRmRmRmRmRmRmRmR diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm index eb9bbb6a69..3e61e5ba9a 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_dead_ratvar.dmm @@ -4,163 +4,163 @@ /area/template_noop) "b" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "c" = ( /obj/item/clockwork/alloy_shards/small, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "d" = ( /obj/structure/destructible/clockwork/wall_gear, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "e" = ( /obj/item/stack/tile/brass, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "f" = ( /turf/closed/mineral/volcanic/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "g" = ( /obj/item/clockwork/alloy_shards/medium/gear_bit, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "h" = ( /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "i" = ( /obj/structure/grille/ratvar/broken, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "j" = ( /turf/closed/wall/clockwork, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "k" = ( /obj/item/clockwork/alloy_shards/small, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "l" = ( /turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "m" = ( /obj/item/clockwork/alloy_shards/medium, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "n" = ( /obj/item/clockwork/component/belligerent_eye/blind_eye, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "o" = ( /obj/item/clockwork/alloy_shards/large, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "p" = ( /obj/item/clockwork/alloy_shards/medium, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "q" = ( /obj/structure/lattice/catwalk/clockwork, /turf/open/lava/smooth/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "r" = ( /obj/structure/lattice/clockwork, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "s" = ( /obj/item/clockwork/alloy_shards/large, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "t" = ( /obj/item/stack/tile/brass, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "u" = ( /obj/structure/grille/ratvar, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "v" = ( /obj/item/clockwork/alloy_shards/medium, /obj/structure/lattice/clockwork, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "w" = ( /obj/structure/grille/ratvar/broken, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "x" = ( /obj/structure/destructible/clockwork/wall_gear, /obj/item/stack/tile/brass, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "y" = ( /obj/item/clockwork/component/geis_capacitor/fallen_armor, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "z" = ( /obj/structure/destructible/clockwork/wall_gear, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "A" = ( /obj/item/clockwork/alloy_shards/clockgolem_remains, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "B" = ( /obj/item/clockwork/weapon/ratvarian_spear, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "C" = ( /obj/item/clockwork/alloy_shards/medium/gear_bit, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "D" = ( /obj/structure/grille/ratvar, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "E" = ( /obj/item/clockwork/alloy_shards/clockgolem_remains, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "F" = ( /obj/structure/dead_ratvar, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "G" = ( /obj/item/stack/tile/brass/fifty, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) "H" = ( /obj/item/trash/fatoray_scrap2, /turf/open/floor/clockwork{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, -/area/lavaland/surface/outdoors/unexplored) +/area/ruin/lavaland/unpowered) (1,1,1) = {" a diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm index ae80410427..3657995118 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hotsprings.dmm @@ -5,6 +5,10 @@ "c" = ( /turf/open/water, /area/lavaland/surface/outdoors) +"k" = ( +/obj/structure/bed/double, +/turf/open/floor/plating/beach/sand, +/area/lavaland/surface/outdoors) "I" = ( /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) @@ -35,7 +39,7 @@ I I a a -I +a a a I @@ -46,11 +50,11 @@ I I I a -U -U -U -U -U +c +c +c +c +c a I I @@ -58,32 +62,32 @@ I (4,1,1) = {" I a -U -L c c c -L -U +c +c +c +c a I "} (5,1,1) = {" I a -U c c c c c -U +c +c a I "} (6,1,1) = {" I -I +a U c c @@ -91,20 +95,20 @@ c c c U -I +a I "} (7,1,1) = {" I -a U -c -c -c -c -c U -a +k +k +U +k +k +U +U I "} (8,1,1) = {" @@ -112,9 +116,9 @@ I a U L -c -c -c +U +U +U L U a @@ -139,7 +143,7 @@ I I a a -I +U a a I diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_lust.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_lust.dmm index 5f10b207bf..0b793d5a02 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_lust.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_lust.dmm @@ -12,15 +12,16 @@ /turf/open/floor/wood, /area/ruin/unpowered) "c" = ( -/obj/item/bdsm_whip/ridingcrop/fattening, /obj/structure/table/bronze, -/turf/open/floor/grass/fairy/red, +/obj/item/melee/curator_whip, +/turf/open/floor/wood, /area/ruin/unpowered) "d" = ( /turf/closed/wall/mineral/wood, /area/ruin/unpowered) "e" = ( -/turf/open/floor/grass/fairy/red, +/obj/item/reagent_containers/glass/bottle/crocin, +/turf/open/floor/wood, /area/ruin/unpowered) "h" = ( /obj/effect/decal/cleanable/semen, @@ -152,6 +153,10 @@ /obj/structure/table/wood/fancy/purple, /turf/open/floor/wood, /area/ruin/unpowered) +"H" = ( +/obj/item/reagent_containers/glass/bottle/hexacrocin, +/turf/open/floor/wood, +/area/ruin/unpowered) "I" = ( /obj/item/reagent_containers/food/snacks/grown/mushroom/jupitercup, /obj/structure/table/wood/fancy/purple, @@ -426,7 +431,7 @@ i i d d -O +H O O x @@ -449,7 +454,7 @@ d d e O -O +H K A m @@ -469,7 +474,7 @@ V i d c -e +O O h I @@ -491,8 +496,8 @@ u i d d -e O +H O K M diff --git a/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm b/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm index dff03785a4..d52d93585b 100644 --- a/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm +++ b/_maps/RandomRuins/SpaceRuins/space_biodome_beach.dmm @@ -117,6 +117,7 @@ "sy" = (/obj/effect/turf_decal/caution{dir = 4},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel,/area/ruin/powered/beach) "sO" = (/obj/machinery/jukebox/disco/indestructible,/turf/open/floor/light/colour_cycle,/area/ruin/powered/beach) "tK" = (/obj/machinery/vending/cola/red,/turf/open/floor/wood,/area/ruin/powered/beach) +"ud" = (/obj/effect/mob_spawn/human/beach/alive,/turf/open/floor/carpet/orange,/area/ruin/powered/beach) "uH" = (/obj/machinery/vending/mealdor,/turf/open/floor/wood,/area/ruin/powered/beach) "vl" = (/obj/structure/closet/athletic_mixed,/obj/effect/turf_decal/sand,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "vY" = (/obj/machinery/hydroponics/constructable,/turf/open/floor/wood,/area/ruin/powered/beach) @@ -129,7 +130,7 @@ "Cy" = (/obj/machinery/light{dir = 4},/obj/effect/overlay/water,/obj/effect/overlay/water/top,/turf/open/floor/plating/beach/water,/area/ruin/powered/beach) "CP" = (/obj/effect/turf_decal/sand,/obj/machinery/light{dir = 8},/turf/open/floor/plasteel,/area/ruin/powered/beach) "Dc" = (/obj/effect/turf_decal/sand,/obj/machinery/shower{pixel_y = 24},/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) -"Dl" = (/obj/effect/mob_spawn/human/bartender/alive,/turf/closed/wall/mineral/sandstone,/area/ruin/powered/beach) +"Dl" = (/obj/structure/chair/comfy/plywood,/obj/item/toy/plush/gs13/metha,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "Dp" = (/obj/machinery/light{dir = 8},/obj/structure/rack,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/obj/item/clothing/shoes/sandal,/turf/open/floor/plating/beach/sand,/area/ruin/powered/beach) "Ec" = (/obj/machinery/vending/clothing,/turf/open/floor/wood,/area/ruin/powered/beach) "Ga" = (/obj/effect/turf_decal/caution{dir = 8},/obj/effect/turf_decal/sand,/turf/open/floor/plasteel,/area/ruin/powered/beach) @@ -160,11 +161,11 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa aaaaaaaaaaaabWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWbWaaaaaaaaaaaa aaaaaaaabWbWbWadajaeafagahaiajakajalamanaoajcdQSQSQSQSQSQSQSQSQScsbWbWbWaaaaaaaa aaaaaabWbWaqararajabasasasatajjFavauauauauajarQSpUTtqTQSTPEcQRQSaCaCvYbWbWaaaaaa -aaaabWbWadarapchajajajawajaxajajajajajajayajcgQSmLbebezwaCaCcWQSbmaCaCZhbWbWaaaa +aaaabWbWadarapchajajajawajaxajajajajajajayajcgQSmLudbezwaCaCcWQSbmaCaCZhbWbWaaaa aaaabWapararazarcefEajaCaDhYaFaEaHaIajaJaKcearQSbebeKfQSaCaCaCQSQSfrQSQSQSbWaaaa aabWbWarararararaAaKajaCaCaCaCaCaCaMajaNaKaAapQSQSQSQSQSaCaCaCQSaAaAaAaAmHbWbWaa aabWaparaOaraOaraAgSajItaQaPaRajaCaSajaTaKaAapQSpUacqTQSaCaCaCQSxUararaqaAapbWaa -aabWcgararaVararaAaKOlaWaWaWaWDlaCaXajaYaKaAarQSmLbebezwaCaCaGQSaAbEaZaraAchbWaa +aabWcgararaVararaAaKOlaWaWaWaWajaCaXajaYaKaAarQSmLbebezwaCaCaGQSaAbEaZaraAchbWaa lFbWararbbarbbaraAaKaKaKoKaKaKbcRObdajSXaKaAarQSbebeKfQSaCaCAIQSaAararoDaAapbWXr aabWararararararaAaKaKGasOsygSajbgajajCPaKaAaUQSQSQSQSQSaCaCuHQSaAararaAaAarbWaa bWbWbWbWDparararaAaKaKaKblaKaKcjaBaBcjaKaKaAarQSpUacqTQSaCaCtKQSaAbzarWRbWbWbWbW @@ -175,7 +176,7 @@ bWpgGcdwaAarararararararbxaparararaZararapararDcDcDcDcaAaAaAaAxUaAaparaAmoGccfbW pIGcwYmhBlararararaparmMararararaUarararararararararaparogararararararoTmhGcGcpI bWiwVOmhaAbzararapbxchbWcgarapararararbAbBarararaUararchbWcgarararaZaraAmhcuVNbW bWlMZlmhaAararararararPbararbEararbFchbGbHcgmbaparararapPbararaUarararaAmhlMcRbW -bWbWbWbWcgbJareDarbJarbJbKbJarbJapararbLbMarararXparbJarbJarbJarbJarbJUMbWbWbWbW +bWbWbWbWcgDlareDarbJarbJbKbJarbJapararbLbMarararXparbJarbJarbJarbJarbJUMbWbWbWbW aabWadapbNararbEbOararararararararbzarararbPararararararararaparararararapbNbWaa lFbWbQbRbRbSbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbRbSbRbRbRbWXr aabWbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbTbWaa diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index 1824af56c6..cb086e313a 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -464,11 +464,11 @@ "aiV" = (/obj/effect/spawner/structure/window,/turf/open/floor/plating,/area/crew_quarters/fitness) "aiW" = (/obj/machinery/camera{c_tag = "Courtroom North"},/obj/machinery/atmospherics/components/unary/vent_scrubber/on,/turf/open/floor/grass,/area/security/courtroom) "aiX" = (/obj/machinery/light/small,/turf/open/floor/grass,/area/security/courtroom) -"aiY" = (/obj/structure/flora/grass/jungle,/turf/open/water/decorative,/area/security/courtroom) -"aiZ" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/water/decorative,/area/security/courtroom) +"aiY" = (/obj/structure/flora/grass/jungle,/turf/open/water/jungle,/area/security/courtroom) +"aiZ" = (/obj/structure/flora/ausbushes/fullgrass,/turf/open/water/jungle,/area/security/courtroom) "aja" = (/obj/machinery/light/small{dir = 1},/turf/open/floor/grass,/area/security/courtroom) "ajb" = (/obj/machinery/atmospherics/components/unary/vent_pump/on,/turf/open/floor/grass,/area/security/courtroom) -"ajc" = (/obj/structure/flora/rock/pile/largejungle{pixel_x = 0; pixel_y = -32},/obj/item/statuebust{pixel_y = -8; pixel_x = 16},/turf/open/water/decorative,/area/security/courtroom) +"ajc" = (/obj/structure/flora/rock/pile/largejungle{pixel_x = 0; pixel_y = -32},/obj/item/statuebust{pixel_y = -8; pixel_x = 16},/turf/open/water/jungle,/area/security/courtroom) "ajd" = (/turf/closed/wall,/area/security/courtroom) "aje" = (/obj/structure/cable{icon_state = "0-2"},/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/port/fore) "ajf" = (/obj/machinery/gulag_teleporter,/turf/open/floor/plasteel,/area/security/processing) @@ -496,8 +496,8 @@ "ajB" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/grass,/area/security/courtroom) "ajC" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/open/floor/grass,/area/security/courtroom) "ajD" = (/obj/structure/flora/tree/jungle,/turf/open/floor/grass,/area/security/courtroom) -"ajE" = (/turf/open/water/decorative,/area/security/courtroom) -"ajF" = (/obj/structure/flora/junglebush,/turf/open/water/decorative,/area/security/courtroom) +"ajE" = (/turf/open/water/jungle,/area/security/courtroom) +"ajF" = (/obj/structure/flora/junglebush,/turf/open/water/jungle,/area/security/courtroom) "ajG" = (/obj/structure/flora/tree/jungle/small,/turf/open/floor/grass,/area/security/courtroom) "ajH" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/flora/ausbushes/sparsegrass,/turf/open/floor/grass,/area/security/courtroom) "ajI" = (/obj/structure/flora/ausbushes/ppflowers,/turf/open/floor/grass,/area/security/courtroom) @@ -531,7 +531,7 @@ "akk" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/closed/wall/r_wall,/area/security/brig) "akl" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/light{dir = 8},/turf/open/floor/grass,/area/security/courtroom) "akm" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/item/clockwork/component/replicant_alloy/smashed_anima_fragment,/turf/open/floor/grass,/area/security/courtroom) -"akn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/flora/ausbushes/reedbush,/turf/open/water/decorative,/area/security/courtroom) +"akn" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/flora/ausbushes/reedbush,/turf/open/water/jungle,/area/security/courtroom) "ako" = (/obj/structure/railing{dir = 1},/obj/structure/chair/bench,/turf/open/floor/wood,/area/security/courtroom) "akp" = (/obj/structure/cable{icon_state = "1-2"},/turf/open/floor/plating,/area/maintenance/solars/port/fore) "akq" = (/obj/structure/sign/warning/vacuum/external{pixel_y = 32},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/security/processing) @@ -555,12 +555,12 @@ "akI" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/cable{icon_state = "1-8"},/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/security/brig) "akJ" = (/obj/machinery/door/window/brigdoor/security/cell{id = "Cell 4"; name = "Cell 4"},/obj/structure/cable{icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/effect/turf_decal/tile/red,/obj/effect/turf_decal/tile/red{dir = 8},/turf/open/floor/plasteel,/area/security/brig) "akK" = (/obj/structure/cable{icon_state = "0-8"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/security/brig) -"akL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/flora/ausbushes/stalkybush,/turf/open/water/decorative,/area/security/courtroom) +"akL" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/obj/structure/flora/ausbushes/stalkybush,/turf/open/water/jungle,/area/security/courtroom) "akM" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/fluff/lightpost,/turf/open/floor/wood,/area/security/courtroom) -"akN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/water/decorative,/area/security/courtroom) +"akN" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/water/jungle,/area/security/courtroom) "akO" = (/obj/structure/railing{dir = 1},/obj/structure/chair/bench/right,/turf/open/floor/wood,/area/security/courtroom) "akP" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/obj/structure/fluff/lightpost{pixel_x = -32},/turf/open/floor/wood,/area/security/courtroom) -"akQ" = (/obj/structure/flora/rock,/turf/open/water/decorative,/area/security/courtroom) +"akQ" = (/obj/structure/flora/rock,/turf/open/water/jungle,/area/security/courtroom) "akR" = (/obj/structure/cable{icon_state = "0-2"},/obj/structure/lattice/catwalk,/turf/open/space,/area/solars/starboard/fore) "akS" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/door/airlock/external{name = "Solar Maintenance"; req_access_txt = "10; 13"},/obj/effect/mapping_helpers/airlock/cyclelink_helper{dir = 1},/turf/open/floor/plating,/area/maintenance/solars/port/fore) "akT" = (/obj/effect/spawner/structure/window/reinforced,/turf/open/floor/plating,/area/maintenance/port/fore) @@ -699,8 +699,8 @@ "anx" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/public/glass{name = "Park"; dir = 4},/turf/open/floor/plasteel/dark,/area/security/courtroom) "any" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 1},/turf/open/floor/grass,/area/security/courtroom) "anz" = (/obj/machinery/atmospherics/components/unary/vent_pump/on{dir = 1},/turf/open/floor/grass,/area/security/courtroom) -"anA" = (/obj/machinery/airalarm{dir = 1; pixel_y = -22},/obj/structure/flora/junglebush/c,/turf/open/water/decorative,/area/security/courtroom) -"anB" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/camera{c_tag = "Courtroom South"; dir = 1},/turf/open/water/decorative,/area/security/courtroom) +"anA" = (/obj/machinery/airalarm{dir = 1; pixel_y = -22},/obj/structure/flora/junglebush/c,/turf/open/water/jungle,/area/security/courtroom) +"anB" = (/obj/structure/extinguisher_cabinet{pixel_x = 5; pixel_y = -32},/obj/machinery/camera{c_tag = "Courtroom South"; dir = 1},/turf/open/water/jungle,/area/security/courtroom) "anD" = (/obj/machinery/door/airlock/maintenance{req_access_txt = "12"},/turf/open/floor/plating,/area/maintenance/fore/secondary) "anE" = (/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/security/brig) "anF" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/supply,/turf/open/floor/plasteel,/area/maintenance/fore/secondary) @@ -3882,7 +3882,7 @@ "bxZ" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel,/area/cargo/storage) "bya" = (/obj/structure/cable{icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/cargo/storage) "byb" = (/obj/structure/cable{icon_state = "4-8"},/turf/open/floor/plasteel,/area/cargo/storage) -"byc" = (/obj/structure/cable{icon_state = "1-8"},/obj/effect/turf_decal/stripes/corner{dir = 8},/turf/open/floor/plasteel,/area/cargo/storage) +"byc" = (/obj/structure/cable{icon_state = "1-8"},/obj/effect/turf_decal/stripes/corner{dir = 8},/obj/structure/rack/shelf,/turf/open/floor/plasteel,/area/cargo/storage) "byd" = (/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/machinery/computer/cargo{dir = 4},/obj/structure/cable{icon_state = "1-4"},/obj/machinery/requests_console{department = "Cargo Bay"; departmentType = 2; pixel_x = -30},/obj/effect/turf_decal/stripes/corner{dir = 4},/turf/open/floor/plasteel,/area/cargo/office) "bye" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/chair/office/dark,/obj/effect/landmark/start/cargo_technician,/turf/open/floor/plasteel,/area/cargo/office) "byf" = (/obj/structure/disposalpipe/segment,/obj/structure/cable{icon_state = "2-8"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/structure/table,/obj/item/stamp/denied{pixel_x = 4; pixel_y = -2},/obj/item/stamp{pixel_x = -3; pixel_y = 3},/turf/open/floor/plasteel,/area/cargo/office) @@ -3942,7 +3942,7 @@ "bzh" = (/obj/machinery/conveyor_switch/oneway{id = "QMLoad2"},/obj/effect/turf_decal/stripes/line{dir = 8},/turf/open/floor/plasteel,/area/cargo/storage) "bzi" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/open/floor/plasteel,/area/cargo/storage) "bzj" = (/obj/effect/turf_decal/bot,/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central6"},/turf/open/floor/plasteel,/area/cargo/storage) -"bzk" = (/obj/machinery/light{dir = 4},/turf/open/floor/plasteel,/area/cargo/storage) +"bzk" = (/obj/machinery/light{dir = 4},/obj/structure/rack/shelf,/turf/open/floor/plasteel,/area/cargo/storage) "bzl" = (/obj/effect/spawner/structure/window/reinforced,/obj/machinery/door/firedoor,/turf/open/floor/plating,/area/cargo/office) "bzm" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/machinery/door/window/westleft{dir = 1; name = "Cargo Desk"; req_access_txt = "50"},/obj/machinery/door/window/westleft{dir = 2; name = "Public Cargo Desk"},/turf/open/floor/plasteel,/area/cargo/office) "bzn" = (/obj/structure/cable{icon_state = "1-2"},/obj/structure/disposalpipe/segment,/obj/effect/spawner/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/obj/machinery/door/firedoor,/turf/open/floor/plating,/area/cargo/office) @@ -4028,7 +4028,7 @@ "bAP" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/open/floor/plasteel,/area/cargo/storage) "bAQ" = (/obj/machinery/atmospherics/components/unary/vent_scrubber/on{dir = 8},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/cargo/storage) "bAR" = (/obj/effect/turf_decal/bot,/obj/machinery/holopad,/turf/open/floor/plasteel,/area/cargo/storage) -"bAS" = (/obj/machinery/light_switch{pixel_x = 27},/turf/open/floor/plasteel,/area/cargo/storage) +"bAS" = (/obj/machinery/light_switch{pixel_x = 27},/obj/structure/rack/shelf,/turf/open/floor/plasteel,/area/cargo/storage) "bAT" = (/obj/machinery/computer/cargo/request{dir = 4},/obj/effect/turf_decal/tile/brown,/obj/effect/turf_decal/tile/brown{dir = 1},/obj/effect/turf_decal/tile/brown{dir = 8},/obj/effect/turf_decal/tile/brown{dir = 4},/turf/open/floor/plasteel,/area/cargo/office) "bAU" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 6},/obj/effect/turf_decal/delivery,/turf/open/floor/plasteel,/area/cargo/office) "bAV" = (/obj/structure/cable{icon_state = "1-4"},/obj/structure/disposalpipe/segment{dir = 5},/obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden,/obj/effect/turf_decal/bot,/turf/open/floor/plasteel,/area/cargo/office) @@ -7204,7 +7204,7 @@ "dIz" = (/obj/structure/closet/secure_closet/personal,/turf/open/floor/plasteel/dark/side,/area/crew_quarters/fitness/sauna) "dNj" = (/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/security/office) "dOe" = (/obj/structure/chair/sofa/left,/turf/open/floor/wood,/area/commons/vacant_room/office) -"dUO" = (/obj/structure/flora/rock/pile,/turf/open/water/decorative,/area/security/courtroom) +"dUO" = (/obj/structure/flora/rock/pile,/turf/open/water/jungle,/area/security/courtroom) "efG" = (/obj/structure/cable{icon_state = "4-8"},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/open/floor/plasteel/dark,/area/maintenance/fore) "elT" = (/obj/machinery/light/small,/obj/effect/landmark/xeno_spawn,/turf/open/floor/plasteel/showroomfloor,/area/maintenance/port/fore) "evK" = (/obj/structure/lattice/catwalk,/obj/item/stack/marker_beacon{anchored = 1; icon_state = "markerburgundy-on"; light_color = "#FA644B"; light_power = 3; light_range = 2; name = "landing marker"; picked_color = "Burgundy"},/turf/open/space/basic,/area/space/nearstation) @@ -7338,7 +7338,7 @@ "mSV" = (/obj/item/trash/tray,/obj/effect/decal/cleanable/dirt,/turf/open/floor/plasteel/grimy,/area/maintenance/starboard/aft) "mTU" = (/turf/open/space/basic,/area/space/nearstation) "mUP" = (/obj/structure/table/wood,/obj/item/trash/raisins,/turf/open/floor/carpet/red,/area/maintenance/bar) -"naR" = (/obj/structure/flora/junglebush/large,/turf/open/water/decorative,/area/security/courtroom) +"naR" = (/obj/structure/flora/junglebush/large,/turf/open/water/jungle,/area/security/courtroom) "nbd" = (/obj/structure/cable{icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden,/turf/open/floor/plasteel/dark,/area/maintenance/port) "ncU" = (/obj/effect/turf_decal/stripes/white/line{dir = 1; icon_state = "steel_decals_central7"},/obj/effect/turf_decal/stripes/white/line{dir = 4; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 5; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 2; icon_state = "steel_decals3"},/obj/effect/turf_decal/stripes/white/line{dir = 6; icon_state = "steel_decals3"},/turf/open/floor/plasteel,/area/engineering/main) "ndA" = (/obj/structure/table/wood,/turf/open/floor/carpet,/area/hallway/secondary/entry) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index a2454aacdf..17b11e6fe6 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -72023,7 +72023,7 @@ /area/service/lawoffice) "rCF" = ( /obj/structure/chair/sofa/corner{ - dir = 1 + dir = 4 }, /turf/open/floor/carpet/red, /area/commons/locker) diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 258074db02..09494e26e3 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -56,7 +56,7 @@ // /datum/map_template/ruin/lavaland/ash_walker // name = "Ash Walker Nest" // id = "ash-walker" -// description = "A race of unbreathing lizards live here, that run faster than a human can, worship a broken dead city, and are capable of reproducing by something involving tentacles? \ +// description = "A race of unbreathing lizards live here, that run faster than a human can, worship a broken dead city, and are capable of reproducing by something involving tentacles? // Probably best to stay clear." // suffix = "lavaland_surface_ash_walker1.dmm" // cost = 20