diff --git a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm index 971fde63cb03..1eb17bf0202d 100644 --- a/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_crashed_engineer.dmm @@ -16,9 +16,6 @@ light_range = 2 }, /area/ruin/unpowered) -"bp" = ( -/turf/open/floor/plating/beach/sand, -/area/overmap_encounter/planetoid/beachplanet/explored) "bv" = ( /obj/machinery/power/smes/shuttle/precharged{ dir = 1 @@ -41,9 +38,7 @@ /mob/living/simple_animal/crab{ name = "\improper Crab" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "cj" = ( /obj/structure/cable{ @@ -158,9 +153,7 @@ /mob/living/simple_animal/hostile/abandoned_minebot{ name = "\improper Abandoned Tony" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "hA" = ( /obj/structure/grille, @@ -231,9 +224,7 @@ /area/ruin/unpowered) "kH" = ( /obj/item/book/manual/wiki/construction, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "kK" = ( /obj/structure/cable{ @@ -246,9 +237,7 @@ /turf/open/floor/plating/rust, /area/ruin/unpowered) "kP" = ( -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "kR" = ( /obj/effect/turf_decal/weather/sand{ @@ -258,9 +247,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "lk" = ( /mob/living/simple_animal/hostile/asteroid/lobstrosity/beach, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "lR" = ( /obj/machinery/power/floodlight, @@ -397,9 +384,7 @@ /obj/structure/cable{ icon_state = "6-9" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "qK" = ( /obj/machinery/power/terminal, @@ -410,9 +395,7 @@ /obj/machinery/atmospherics/pipe/simple/yellow/visible{ dir = 10 }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "rt" = ( /obj/effect/turf_decal/weather/sand{ @@ -433,15 +416,11 @@ /obj/structure/cable{ icon_state = "4-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sv" = ( /obj/machinery/atmospherics/components/binary/valve, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sA" = ( /obj/structure/cable{ @@ -454,9 +433,7 @@ /area/ruin/unpowered) "sB" = ( /obj/item/book/manual/wiki/engineering, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "sN" = ( /obj/structure/reagent_dispensers/fueltank, @@ -475,9 +452,7 @@ /obj/structure/cable{ icon_state = "0-5" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "ty" = ( /obj/effect/turf_decal/weather/sand{ @@ -501,21 +476,13 @@ /obj/structure/cable{ icon_state = "4-8" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "uw" = ( /obj/structure/girder, /obj/effect/turf_decal/weather/sand, /turf/open/floor/plating/rust, /area/ruin/unpowered) -"vO" = ( -/turf/open/floor/plating/beach/sand{ - icon_state = "sand_dug"; - light_range = 2 - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "wu" = ( /obj/structure/cable{ icon_state = "2-4" @@ -539,9 +506,7 @@ "xV" = ( /obj/effect/decal/cleanable/glass, /obj/item/shard, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/dense/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "yc" = ( /obj/effect/turf_decal/atmos/plasma, @@ -559,14 +524,6 @@ "ys" = ( /turf/template_noop, /area/template_noop) -"yv" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "yA" = ( /obj/effect/turf_decal/industrial/warning/corner{ dir = 8 @@ -602,9 +559,7 @@ }, /area/overmap_encounter/planetoid/beachplanet/explored) "Ae" = ( -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Ah" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, @@ -616,17 +571,13 @@ /obj/structure/cable{ icon_state = "4-9" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "At" = ( /obj/structure/cable{ icon_state = "5-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "AT" = ( /obj/structure/cable{ @@ -685,9 +636,7 @@ /obj/structure/cable{ icon_state = "1-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "CW" = ( /obj/machinery/suit_storage_unit/inherit, @@ -696,9 +645,7 @@ /area/ruin/unpowered) "DB" = ( /obj/item/stack/cable_coil/red, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "DC" = ( /turf/open/water/beach/deep, @@ -707,15 +654,11 @@ /obj/structure/cable{ icon_state = "0-9" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "DO" = ( /obj/structure/flora/tree/palm, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "DU" = ( /obj/structure/cable{ @@ -767,9 +710,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Gj" = ( /obj/effect/decal/cleanable/glass, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/dense/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Gl" = ( /turf/closed/wall/rust, @@ -796,9 +737,11 @@ /obj/structure/cable{ icon_state = "0-6" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, +/area/overmap_encounter/planetoid/beachplanet/explored) +"HH" = ( +/mob/living/simple_animal/hostile/asteroid/lobstrosity/beach, +/turf/open/floor/plating/asteroid/sand/dense/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "HK" = ( /obj/structure/closet/secure_closet/engineering_welding, @@ -817,10 +760,7 @@ "Ir" = ( /obj/item/shovel, /obj/item/stack/ore/glass/beach, -/turf/open/floor/plating/beach/sand{ - icon_state = "sand_dug"; - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "IZ" = ( /obj/machinery/power/shuttle/engine/electric{ @@ -905,9 +845,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "LI" = ( /obj/structure/flora/rock, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Ms" = ( /obj/effect/turf_decal/weather/sand{ @@ -920,9 +858,7 @@ /area/ruin/unpowered) "Na" = ( /obj/item/pickaxe/improvised, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Nh" = ( /obj/structure/cable{ @@ -950,9 +886,7 @@ /area/ruin/unpowered) "Ot" = ( /obj/item/geiger_counter, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "OI" = ( /obj/effect/turf_decal/weather/sand{ @@ -1014,9 +948,7 @@ /obj/structure/cable{ icon_state = "6-8" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "QQ" = ( /obj/structure/cable{ @@ -1055,11 +987,12 @@ }, /turf/open/floor/plasteel/tech, /area/ruin/unpowered) +"RD" = ( +/turf/open/floor/plating/asteroid/sand/dense/lit, +/area/overmap_encounter/planetoid/beachplanet/explored) "Sl" = ( /obj/structure/radioactive/stack, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Sx" = ( /obj/structure/cable{ @@ -1072,9 +1005,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "SE" = ( /obj/structure/barricade/wooden, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/ruin/unpowered) "SF" = ( /obj/structure/cable{ @@ -1101,9 +1032,7 @@ /obj/structure/cable{ icon_state = "5-8" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Tf" = ( /obj/structure/cable{ @@ -1122,9 +1051,7 @@ /obj/structure/cable{ icon_state = "1-2" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "TB" = ( /obj/effect/spawner/structure/window/hollow/directional{ @@ -1135,9 +1062,7 @@ "TI" = ( /obj/structure/radioactive/waste, /obj/effect/decal/cleanable/greenglow, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Uk" = ( /turf/open/floor/plating/grass/beach/lit, @@ -1181,9 +1106,7 @@ /area/overmap_encounter/planetoid/beachplanet/explored) "Wg" = ( /obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Wn" = ( /obj/machinery/computer/arcade/orion_trail{ @@ -1246,9 +1169,7 @@ /obj/structure/cable{ icon_state = "0-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "Yh" = ( /obj/effect/turf_decal/weather/sand{ @@ -1277,9 +1198,7 @@ /obj/structure/cable{ icon_state = "1-10" }, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, +/turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) "ZW" = ( /obj/machinery/pipedispenser, @@ -1597,7 +1516,7 @@ ys Ae Ae Ae -yv +Ae Uz WH WH @@ -1791,7 +1710,7 @@ Ae Ae Ae Ae -bp +Ae ys ys ys @@ -1825,7 +1744,7 @@ Ae Ae Ae Ae -bp +Ae Ae ys ys @@ -1893,7 +1812,7 @@ Ae Ae Ae Ae -bp +Ae Ae Ae ys @@ -1910,7 +1829,7 @@ ug cj Ae Ae -vO +Ae Ae Ae SF @@ -1927,7 +1846,7 @@ Ae Hp Ae Ae -bp +Ae Ae Ae Ae @@ -1961,7 +1880,7 @@ DO Ae qH Ae -bp +Ae Ae Ae Ae @@ -1969,8 +1888,8 @@ Ae (21,1,1) = {" ys ys -Ae -Ae +RD +RD iZ fT Kp @@ -1995,7 +1914,7 @@ Ae Ae Ae qH -bp +Ae Ae sB Ae @@ -2004,14 +1923,14 @@ Ae ys ys Ae -vO +RD ij tX PR dG tB -Ae -Ae +RD +RD qD qD Om @@ -2038,14 +1957,14 @@ Ae ys ys Ae -Ae -Ae +RD +RD SZ Wn Qw tB -Ae -Ae +RD +RD qD ni Qw @@ -2072,14 +1991,14 @@ Ae ys ys ys -Ae -Ae +RD +RD Gj rt kR -Ae -Ae -Ae +RD +RD +RD qD Rj JW @@ -2106,12 +2025,12 @@ Ae ys ys ys -Ae -Ae -Ae -Ae +RD +RD +RD +RD xV -Ae +RD Wg Ae qD @@ -2141,10 +2060,10 @@ ys ys ys ys -Ae -lk -Ae -Ae +RD +HH +RD +RD Ae Ae Ae diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm index 8c8097e2c794..fa9aa8f683db 100644 --- a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm @@ -48,18 +48,6 @@ /obj/structure/destructible/tribal_torch/lit, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) -"bO" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/obj/effect/turf_decal/weather/sand, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "ca" = ( /obj/structure/chair/plastic{ dir = 1 @@ -332,20 +320,6 @@ light_range = 2 }, /area/ruin/beach/float_resort) -"jh" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "jQ" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -476,6 +450,17 @@ }, /turf/open/floor/plating, /area/overmap_encounter/planetoid/beachplanet/explored) +"ni" = ( +/obj/structure/table/wood, +/obj/effect/turf_decal/weather/sand{ + dir = 1 + }, +/obj/item/candle, +/obj/effect/spawner/random/food_or_drink/donut, +/turf/open/floor/wood{ + light_range = 2 + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "nw" = ( /obj/structure/railing/wood{ dir = 4 @@ -508,6 +493,18 @@ /obj/structure/flora/junglebush/large, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) +"oB" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/turf_decal/weather/sand, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "oJ" = ( /obj/effect/turf_decal/industrial/stand_clear{ dir = 1 @@ -533,24 +530,6 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"pq" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/obj/structure/fluff/beach_umbrella{ - pixel_x = -18; - pixel_y = 13 - }, -/turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "pr" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -727,6 +706,18 @@ light_range = 2 }, /area/ruin/beach/float_resort) +"tl" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/turf_decal/weather/sand, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/orange{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "tA" = ( /obj/structure/railing/corner/wood{ dir = 8 @@ -750,6 +741,20 @@ light_range = 2 }, /area/ruin/beach/float_resort/villa) +"ug" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "uk" = ( /obj/effect/turf_decal/weather/sand{ dir = 6 @@ -758,6 +763,20 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"uJ" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/orange{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "uV" = ( /obj/structure/chair/plastic, /turf/open/floor/wood{ @@ -819,17 +838,6 @@ light_range = 2 }, /area/ruin/beach/float_resort/villa) -"wp" = ( -/obj/structure/table/wood, -/obj/effect/turf_decal/weather/sand{ - dir = 1 - }, -/obj/item/candle, -/obj/effect/spawner/random/food_or_drink/donut, -/turf/open/floor/wood{ - light_range = 2 - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "wx" = ( /obj/structure/flora/ausbushes/grassybush, /turf/open/floor/plating/grass/beach/lit, @@ -989,6 +997,20 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"Bu" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 1 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "Bw" = ( /obj/structure/table/wood, /obj/structure/curtain/cloth, @@ -1385,20 +1407,6 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"Ka" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "Kv" = ( /obj/effect/turf_decal/weather/sand{ dir = 9 @@ -1537,32 +1545,6 @@ /obj/structure/flora/ausbushes/grassybush, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) -"NS" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 10 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 1 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) -"NU" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/turf_decal/weather/sand, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "NV" = ( /turf/closed/wall/mineral/wood/nonmetal, /area/ruin/beach/float_resort/villa) @@ -1594,6 +1576,24 @@ /obj/structure/flora/ausbushes/ywflowers, /turf/open/floor/plating/grass/beach/lit, /area/overmap_encounter/planetoid/beachplanet/explored) +"OU" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/obj/structure/fluff/beach_umbrella{ + pixel_x = -18; + pixel_y = 13 + }, +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "Pc" = ( /obj/effect/turf_decal/weather/sand{ dir = 9 @@ -2585,7 +2585,7 @@ Rt Rt Rt Rt -NS +Bu Rt YP YP @@ -2639,7 +2639,7 @@ Cn Rt Cn am -bO +oB Rt YP YP @@ -2740,7 +2740,7 @@ Rt Rt Rt Zp -NU +tl JQ FB UA @@ -2794,7 +2794,7 @@ Rt Zp VY QS -jh +uJ Rt qi Gv @@ -2954,7 +2954,7 @@ qS Fs QV Rt -wp +ni NC Tc Rt @@ -3380,8 +3380,8 @@ kp kp Dr Rt -Ka -pq +ug +OU Rt Rt Rt diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm index 39bebb15982e..7a4da7abdac2 100644 --- a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm @@ -112,10 +112,6 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"bs" = ( -/obj/effect/spawner/random/vending/cola, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "bu" = ( /obj/structure/table, /obj/machinery/light/small/directional/east, @@ -127,6 +123,20 @@ /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/plating/grass/beach/lit, /area/overmap_encounter/planetoid/beachplanet/explored) +"bX" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "ca" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/ywflowers, @@ -267,17 +277,6 @@ /obj/structure/chair/sofa/brown/directional/east, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown/hotel) -"dL" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "dT" = ( /turf/open/floor/wood, /area/ruin/beach/oceantown) @@ -365,6 +364,17 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"eF" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "eG" = ( /obj/structure/railing/corner{ dir = 8 @@ -410,13 +420,6 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plasteel, /area/ruin/beach/oceantown) -"fn" = ( -/obj/structure/rack, -/obj/effect/spawner/random/food_or_drink/donut/slimejelly, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "fp" = ( /obj/structure/railing/wood, /turf/open/water/beach, @@ -607,20 +610,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/wood, /area/ruin/beach/oceantown) -"hF" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 8 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "hG" = ( /obj/machinery/light/small/directional/south, /turf/open/floor/wood, @@ -709,10 +698,9 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"ix" = ( +"iy" = ( /obj/structure/rack, /obj/effect/spawner/random/food_or_drink/donut/slimejelly, -/obj/effect/spawner/random/food_or_drink/donut, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) "iz" = ( @@ -774,6 +762,12 @@ /obj/structure/railing/corner/wood, /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) +"jX" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) "jY" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, @@ -942,20 +936,6 @@ /obj/structure/fluff/beach_umbrella/cap, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) -"lZ" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 4 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "mc" = ( /obj/structure/flora/ausbushes/sparsegrass, /obj/structure/flora/ausbushes/leafybush, @@ -980,20 +960,6 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"mr" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "mt" = ( /obj/effect/turf_decal/industrial/stand_clear{ dir = 4 @@ -1124,17 +1090,6 @@ /obj/structure/flora/ausbushes/sparsegrass, /turf/open/floor/plating/grass/jungle, /area/overmap_encounter/planetoid/beachplanet/explored) -"oz" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "oF" = ( /obj/effect/turf_decal/weather/sand, /obj/effect/turf_decal/weather/sand, @@ -1231,6 +1186,12 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"pP" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut/slimejelly, +/obj/effect/spawner/random/food_or_drink/donut, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) "qb" = ( /obj/effect/turf_decal/siding/thinplating/dark{ dir = 1 @@ -1335,20 +1296,6 @@ /obj/machinery/vending/boozeomat, /turf/open/floor/plasteel, /area/ruin/beach/oceantown/bar) -"rL" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "rN" = ( /obj/structure/closet/secure_closet/freezer/meat, /obj/effect/turf_decal/siding/thinplating/light, @@ -1558,15 +1505,6 @@ light_range = 2 }, /area/ruin/beach/oceantown/bar) -"un" = ( -/obj/structure/rack, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut/slimejelly, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "ur" = ( /obj/structure/railing/wood{ dir = 8 @@ -1601,6 +1539,13 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"uP" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut/slimejelly, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) "uV" = ( /obj/machinery/light/small/directional/east, /turf/open/floor/plasteel, @@ -1638,6 +1583,20 @@ /obj/machinery/pdapainter, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) +"vD" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/orange{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "vE" = ( /obj/structure/flora/ausbushes/brflowers, /turf/open/floor/plating/grass/beach/lit, @@ -1657,6 +1616,13 @@ /obj/structure/table/wood, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) +"wb" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) "we" = ( /obj/effect/turf_decal/siding/thinplating/dark/corner, /turf/open/floor/plasteel/dark, @@ -1672,20 +1638,6 @@ }, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) -"wt" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "wu" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal{ dir = 8 @@ -1698,6 +1650,17 @@ }, /turf/open/floor/plasteel, /area/ruin/beach/oceantown/shop) +"wv" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "wF" = ( /obj/structure/flora/ausbushes/fullgrass, /obj/structure/flora/ausbushes/brflowers, @@ -1902,20 +1865,6 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"yJ" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/orange{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "yQ" = ( /obj/structure/railing/corner/wood, /turf/open/floor/plating/asteroid/sand/lit, @@ -2006,6 +1955,10 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"zS" = ( +/obj/effect/spawner/random/vending/snack, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) "zU" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/banana, @@ -2255,20 +2208,6 @@ /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) -"CW" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 4 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "De" = ( /obj/structure/railing/wood, /obj/effect/turf_decal/weather/sand{ @@ -2393,20 +2332,6 @@ /obj/effect/turf_decal/weather/sand, /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) -"Er" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 10 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/purple{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "Eu" = ( /obj/structure/chair/plastic{ dir = 8 @@ -2484,6 +2409,48 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"Fa" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/orange{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) +"Fo" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) +"Fr" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/purple{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "FA" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -2556,6 +2523,24 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"FY" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/obj/item/clothing/under/shorts/blue{ + name = "blue swimming shorts"; + desc = "100% pure cotton!" + }, +/turf/open/floor/carpet/blue{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "Ga" = ( /obj/effect/turf_decal/siding/wood/corner, /obj/effect/turf_decal/siding/wood/corner{ @@ -2675,6 +2660,20 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"GX" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "GZ" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/closet/crate/freezer, @@ -2894,6 +2893,20 @@ /obj/machinery/light/small/directional/north, /turf/open/floor/plasteel, /area/ruin/beach/oceantown/hotel) +"Je" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/purple{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "Jh" = ( /obj/effect/turf_decal/siding/wood{ dir = 6 @@ -2993,6 +3006,15 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"Kf" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/obj/effect/spawner/random/food_or_drink/donut/slimejelly, +/obj/effect/spawner/random/food_or_drink/donut/jelly, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) "Kk" = ( /obj/structure/railing/wood{ dir = 6 @@ -3040,17 +3062,6 @@ /obj/machinery/light/directional/south, /turf/open/floor/plasteel/grimy, /area/ruin/beach/oceantown/hotel) -"KC" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "KD" = ( /obj/structure/closet/secure_closet/freezer/kitchen, /obj/effect/turf_decal/box, @@ -3133,6 +3144,20 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"Lt" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 4 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "Lx" = ( /obj/structure/rack, /obj/item/reagent_containers/food/snacks/candiedapple, @@ -3156,18 +3181,18 @@ }, /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) -"LN" = ( +"LF" = ( /obj/effect/turf_decal/weather/sand{ dir = 6 }, /obj/effect/turf_decal/weather/sand{ - dir = 8 + dir = 10 }, /obj/effect/decal/cleanable/dirt/dust{ layer = 2.01 }, -/turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand +/turf/open/floor/carpet/orange{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit }, /area/overmap_encounter/planetoid/beachplanet/explored) "LR" = ( @@ -3365,10 +3390,21 @@ /obj/structure/flora/tree/palm, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) -"NX" = ( +"Ob" = ( /obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut/slimejelly, /obj/effect/spawner/random/food_or_drink/donut/jelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) +"Oc" = ( +/obj/structure/rack, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut, +/obj/effect/spawner/random/food_or_drink/donut/slimejelly, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) "Oe" = ( @@ -3429,29 +3465,16 @@ /obj/structure/flora/junglebush, /turf/open/floor/plating/asteroid/sand/lit, /area/overmap_encounter/planetoid/beachplanet/explored) -"OP" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 6 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/obj/item/clothing/under/shorts/blue{ - name = "blue swimming shorts"; - desc = "100% pure cotton!" - }, -/turf/open/floor/carpet/blue{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "OR" = ( /obj/structure/flora/ausbushes/grassybush, /obj/structure/flora/ausbushes/ppflowers, /turf/open/floor/plating/grass/beach/lit, /area/overmap_encounter/planetoid/beachplanet/explored) +"OS" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/turf/open/floor/carpet, +/area/ruin/beach/oceantown) "OT" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal{ dir = 8 @@ -3504,20 +3527,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/plasteel/dark, /area/ruin/beach/oceantown/shop) -"Ps" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 9 - }, -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/purple{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "Pv" = ( /obj/structure/closet/crate/bin, /turf/open/floor/wood, @@ -3539,17 +3548,27 @@ /obj/structure/chair/sofa/brown/right/directional/south, /turf/open/floor/wood, /area/ruin/beach/oceantown) -"PF" = ( -/obj/structure/rack, -/obj/effect/spawner/random/food_or_drink/donut/slimejelly, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "PH" = ( /obj/effect/turf_decal/weather/sand{ dir = 1 }, /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) +"PL" = ( +/obj/effect/spawner/random/vending/cola, +/turf/open/floor/plasteel/patterned/grid, +/area/ruin/beach/oceantown/shop) +"PM" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 10 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "PN" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/water/beach, @@ -3568,10 +3587,6 @@ }, /turf/open/water/beach, /area/overmap_encounter/planetoid/beachplanet/explored) -"Qf" = ( -/obj/effect/spawner/random/vending/snack, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "Qm" = ( /obj/structure/railing/wood, /turf/open/floor/plating/asteroid/sand/lit, @@ -3670,6 +3685,17 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"RV" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 6 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/cyan{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "Sc" = ( /turf/open/floor/plasteel/grimy, /area/ruin/beach/oceantown/hotel) @@ -3731,14 +3757,6 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) -"SS" = ( -/obj/structure/rack, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut, -/obj/effect/spawner/random/food_or_drink/donut/slimejelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "SY" = ( /obj/structure/chair/comfy/orange/directional/north, /turf/open/floor/carpet/black, @@ -3847,17 +3865,6 @@ /obj/structure/chair/wood, /turf/open/floor/carpet/green, /area/ruin/beach/oceantown) -"UF" = ( -/obj/effect/turf_decal/weather/sand{ - dir = 5 - }, -/obj/effect/decal/cleanable/dirt/dust{ - layer = 2.01 - }, -/turf/open/floor/carpet/cyan{ - baseturfs = /turf/open/floor/plating/beach/sand - }, -/area/overmap_encounter/planetoid/beachplanet/explored) "UH" = ( /obj/structure/chair/office{ dir = 1 @@ -3904,11 +3911,6 @@ /obj/effect/turf_decal/box, /turf/open/floor/plasteel/white, /area/ruin/beach/oceantown/bar) -"Vr" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/turf/open/floor/carpet, -/area/ruin/beach/oceantown) "VI" = ( /obj/structure/railing/wood{ dir = 8 @@ -3943,13 +3945,6 @@ /obj/item/stack/sheet/mineral/coal/ten, /turf/open/floor/plasteel/patterned/grid, /area/ruin/beach/oceantown/shop) -"VQ" = ( -/obj/structure/rack, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "VS" = ( /obj/structure/table, /obj/machinery/processor, @@ -4098,6 +4093,20 @@ light_range = 2 }, /area/overmap_encounter/planetoid/beachplanet/explored) +"XE" = ( +/obj/effect/turf_decal/weather/sand{ + dir = 5 + }, +/obj/effect/turf_decal/weather/sand{ + dir = 9 + }, +/obj/effect/decal/cleanable/dirt/dust{ + layer = 2.01 + }, +/turf/open/floor/carpet/orange{ + baseturfs = /turf/open/floor/plating/asteroid/sand/lit + }, +/area/overmap_encounter/planetoid/beachplanet/explored) "XI" = ( /obj/structure/table/wood/fancy/black, /obj/item/reagent_containers/food/drinks/drinkingglass{ @@ -4110,15 +4119,6 @@ /obj/structure/flora/ausbushes/fullgrass, /turf/open/floor/plating/grass, /area/overmap_encounter/planetoid/beachplanet/explored) -"XQ" = ( -/obj/structure/rack, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/obj/effect/spawner/random/food_or_drink/donut/slimejelly, -/obj/effect/spawner/random/food_or_drink/donut/jelly, -/turf/open/floor/plasteel/patterned/grid, -/area/ruin/beach/oceantown/shop) "XS" = ( /obj/effect/turf_decal/corner/opaque/white/diagonal{ dir = 8 @@ -4445,8 +4445,8 @@ YU "} (3,1,1) = {" qp -Ps -Er +Fr +Je sa sa lL @@ -4686,8 +4686,8 @@ pn pn pn qp -hF -yJ +vD +Fa sa sa sa @@ -4861,9 +4861,9 @@ Hu Ap Ip OT -Qf +zS Tj -bs +PL AY Un gb @@ -5372,8 +5372,8 @@ qp sa sa sa -CW -rL +Lt +GX sa sa sa @@ -5678,8 +5678,8 @@ YU (19,1,1) = {" qp sa -lZ -OP +Fo +FY sa sa sa @@ -6143,8 +6143,8 @@ Ca Go OK sa -wt -mr +XE +LF sa sa sa @@ -6720,7 +6720,7 @@ jv xh dT rh -Vr +OS xh Cf xh @@ -8219,8 +8219,8 @@ YU (52,1,1) = {" Ca OK -KC -dL +wv +PM sa sa Xk @@ -8296,8 +8296,8 @@ YU (53,1,1) = {" pn qp -UF -oz +eF +RV sa sa Sp @@ -9220,8 +9220,8 @@ YU (65,1,1) = {" qp sa -lZ -LN +Fo +bX sa sa yb @@ -9315,8 +9315,8 @@ MP vf UX UX -un -VQ +Oc +wb tI tI em @@ -9469,8 +9469,8 @@ MP Ho xe tI -XQ -SS +Kf +Ob tI tI GJ @@ -9593,7 +9593,7 @@ xh Al ND xh -Vr +OS gX bf xh @@ -9623,12 +9623,12 @@ MP mR UX UX -PF -fn +iy +uP tI -ix -NX -NX +pP +jX +jX UX Mi Mi diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm index a427310ff104..9fb79427bde4 100644 --- a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm +++ b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm @@ -18,12 +18,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/wood, /area/ruin/beach/treasure_cove) -"ay" = ( -/obj/structure/flora/tree/palm, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/ruin/unpowered) "aY" = ( /obj/structure/flora/ausbushes/reedbush, /turf/open/water/beach, @@ -32,12 +26,6 @@ /obj/structure/flora/rock/beach, /turf/open/water/beach, /area/ruin/unpowered) -"bI" = ( -/obj/effect/turf_decal/industrial/hatch/yellow, -/obj/machinery/light/small/directional/north, -/obj/effect/spawner/random/decoration/glowstick, -/turf/open/floor/concrete/slab_1, -/area/ruin/beach/treasure_cove) "bN" = ( /obj/effect/turf_decal/weather/sand, /turf/open/water/beach, @@ -47,15 +35,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/plating/dirt/jungle/dark/lit, /area/ruin/beach/treasure_cove) -"bQ" = ( -/obj/structure/railing/wood{ - layer = 3.1; - dir = 8 - }, -/obj/effect/decal/cleanable/dirt/dust, -/obj/effect/spawner/random/decoration/glowstick, -/turf/open/floor/plating/dirt/jungle, -/area/ruin/unpowered) "cJ" = ( /obj/effect/turf_decal/industrial/outline/yellow, /obj/structure/ore_box, @@ -192,12 +171,6 @@ footstep = "wood" }, /area/ruin/beach/treasure_cove) -"ht" = ( -/obj/effect/overlay/palmtree_r, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/ruin/unpowered) "hJ" = ( /obj/effect/turf_decal/industrial/traffic, /obj/effect/turf_decal/industrial/traffic{ @@ -206,11 +179,6 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/concrete/slab_1, /area/ruin/beach/treasure_cove) -"hS" = ( -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/ruin/unpowered) "ie" = ( /obj/structure/closet/crate/grave/loot{ desc = "Here lies our great brother and infamous pirate" @@ -280,6 +248,9 @@ icon_state = "wood-broken5" }, /area/ruin/beach/treasure_cove) +"jQ" = ( +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "jT" = ( /obj/structure/barricade/wooden, /obj/structure/barricade/wooden/crude, @@ -298,12 +269,6 @@ }, /turf/open/water/beach, /area/ruin/unpowered) -"kl" = ( -/obj/effect/overlay/palmtree_l, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/ruin/unpowered) "km" = ( /mob/living/simple_animal/hostile/cockroach, /turf/open/floor/wood{ @@ -355,6 +320,10 @@ /obj/effect/decal/cleanable/dirt/dust, /turf/open/floor/concrete/slab_1, /area/ruin/beach/treasure_cove) +"mV" = ( +/obj/effect/overlay/palmtree_r, +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "nf" = ( /obj/structure/closet/body_bag, /obj/effect/decal/cleanable/blood/gibs/old{ @@ -536,15 +505,11 @@ icon_state = "wood-broken4" }, /area/ruin/beach/treasure_cove) -"rp" = ( -/obj/item/restraints/handcuffs/cable/zipties/used, -/obj/item/ammo_casing/spent{ - icon_state = "rifle-brass"; - pixel_x = -10; - pixel_y = 4 - }, +"rf" = ( +/obj/effect/turf_decal/industrial/hatch/yellow, +/obj/machinery/light/small/directional/north, /obj/effect/spawner/random/decoration/glowstick, -/turf/open/floor/wood, +/turf/open/floor/concrete/slab_1, /area/ruin/beach/treasure_cove) "rA" = ( /mob/living/simple_animal/beachcarp/trout{ @@ -780,6 +745,10 @@ }, /turf/open/floor/plating/grass/beach/lit, /area/ruin/unpowered) +"xC" = ( +/obj/effect/overlay/palmtree_l, +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "xU" = ( /obj/effect/turf_decal/siding/wood{ dir = 9 @@ -913,6 +882,10 @@ /obj/structure/spacevine/dense, /turf/open/water/beach, /area/ruin/unpowered) +"Cq" = ( +/mob/living/simple_animal/crab, +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "Cz" = ( /obj/effect/turf_decal/siding/wood/corner{ dir = 4 @@ -973,6 +946,15 @@ /mob/living/simple_animal/hostile/human/frontier, /turf/open/floor/plating/dirt/jungle/lit, /area/ruin/beach/treasure_cove) +"FL" = ( +/obj/structure/railing/wood{ + layer = 3.1; + dir = 8 + }, +/obj/effect/decal/cleanable/dirt/dust, +/obj/effect/spawner/random/decoration/glowstick, +/turf/open/floor/plating/dirt/jungle, +/area/ruin/unpowered) "Gm" = ( /obj/effect/turf_decal/siding/wood, /obj/structure/bed{ @@ -981,6 +963,16 @@ /obj/effect/decal/cleanable/glass, /turf/open/floor/wood/walnut, /area/ruin/beach/treasure_cove) +"GA" = ( +/obj/item/restraints/handcuffs/cable/zipties/used, +/obj/item/ammo_casing/spent{ + icon_state = "rifle-brass"; + pixel_x = -10; + pixel_y = 4 + }, +/obj/effect/spawner/random/decoration/glowstick, +/turf/open/floor/wood, +/area/ruin/beach/treasure_cove) "GC" = ( /obj/structure/spacevine, /turf/open/water/beach, @@ -1422,6 +1414,10 @@ /obj/effect/turf_decal/industrial/outline/yellow, /turf/open/floor/concrete/slab_2, /area/ruin/beach/treasure_cove) +"Wb" = ( +/obj/structure/flora/tree/palm, +/turf/open/floor/plating/asteroid/sand/lit, +/area/ruin/unpowered) "Wh" = ( /obj/item/stack/ore/salvage/scrapmetal{ pixel_y = -15; @@ -1436,12 +1432,6 @@ /mob/living/simple_animal/hostile/cockroach, /turf/open/floor/plating/rust, /area/ruin/beach/treasure_cove) -"WX" = ( -/mob/living/simple_animal/crab, -/turf/open/floor/plating/beach/sand{ - light_range = 2 - }, -/area/ruin/unpowered) "Xp" = ( /obj/effect/turf_decal/siding/wood{ dir = 8 @@ -1593,25 +1583,25 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -kl -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ +jQ +xC +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv Iv @@ -1639,25 +1629,25 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv "} @@ -1696,13 +1686,13 @@ UY UY UY jZ -hS -hS -hS -hS -kl -hS -hS +jQ +jQ +jQ +jQ +xC +jQ +jQ Iv Iv "} @@ -1744,11 +1734,11 @@ TN UY UY jZ -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ Iv "} (6,1,1) = {" @@ -1790,11 +1780,11 @@ TN TN TN jZ -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ "} (7,1,1) = {" Iv @@ -1825,10 +1815,10 @@ lt lt lt lt -hS -hS -WX -hS +jQ +jQ +Cq +jQ db EE TN @@ -1836,10 +1826,10 @@ TN TN TN jZ -hS -hS -hS -hS +jQ +jQ +jQ +jQ "} (8,1,1) = {" Iv @@ -1871,20 +1861,20 @@ lt lt lt lt -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ db TN TN TN bN -hS -hS -hS -hS +jQ +jQ +jQ +jQ "} (9,1,1) = {" Iv @@ -1916,20 +1906,20 @@ lt lt lt lt -hS -hS -hS -kl -hS -hS +jQ +jQ +jQ +xC +jQ +jQ TJ bB TN bN -hS -hS -hS -hS +jQ +jQ +jQ +jQ "} (10,1,1) = {" Iv @@ -1961,20 +1951,20 @@ lt lt lt lt -hS -hS -hS -WX -hS -hS +jQ +jQ +jQ +Cq +jQ +jQ TJ TN TN TN jZ -hS -hS -hS +jQ +jQ +jQ "} (11,1,1) = {" Iv @@ -1992,7 +1982,7 @@ Wa vb qN pz -bI +rf Ry Ty Ry @@ -2006,10 +1996,10 @@ lt lt lt lt -hS -hS -hS -hS +jQ +jQ +jQ +jQ VF UY TN @@ -2017,9 +2007,9 @@ TN TN TN bN -hS -hS -hS +jQ +jQ +jQ "} (12,1,1) = {" Iv @@ -2052,8 +2042,8 @@ lt lt lt lt -hS -hS +jQ +jQ VF TN TN @@ -2062,9 +2052,9 @@ TN TN tH bN -hS -hS -hS +jQ +jQ +jQ "} (13,1,1) = {" Iv @@ -2107,9 +2097,9 @@ TN TN TN bN -hS -hS -hS +jQ +jQ +jQ "} (14,1,1) = {" Iv @@ -2153,8 +2143,8 @@ TN TN TN jZ -hS -hS +jQ +jQ "} (15,1,1) = {" Iv @@ -2198,8 +2188,8 @@ EE TN TN bN -hS -hS +jQ +jQ "} (16,1,1) = {" Iv @@ -2239,12 +2229,12 @@ TN TN TN CB -hS +jQ TJ TN bN -hS -hS +jQ +jQ "} (17,1,1) = {" Iv @@ -2283,13 +2273,13 @@ SD xg TN bN -hS +jQ lt lt TN bN -hS -hS +jQ +jQ "} (18,1,1) = {" lt @@ -2333,8 +2323,8 @@ lt TN TN bN -hS -hS +jQ +jQ "} (19,1,1) = {" lt @@ -2378,8 +2368,8 @@ TN TN TN bN -hS -hS +jQ +jQ "} (20,1,1) = {" lt @@ -2404,7 +2394,7 @@ wS Te le ZO -rp +GA Uf tD Rn @@ -2423,8 +2413,8 @@ TN TN TN bN -hS -hS +jQ +jQ "} (21,1,1) = {" lt @@ -2468,8 +2458,8 @@ TN TN TN bN -hS -hS +jQ +jQ "} (22,1,1) = {" lt @@ -2513,15 +2503,15 @@ TN TN tH bN -hS -hS +jQ +jQ "} (23,1,1) = {" Iv lt lt -hS -hS +jQ +jQ lt lt lt @@ -2558,15 +2548,15 @@ lt TN TN bN -hS -hS +jQ +jQ "} (24,1,1) = {" Iv lt lt -hS -hS +jQ +jQ lt lt lt @@ -2603,15 +2593,15 @@ TN TN TN bN -hS -hS +jQ +jQ "} (25,1,1) = {" Iv lt -hS -hS -hS +jQ +jQ +jQ lt lt lt @@ -2629,7 +2619,7 @@ oR Jd cU nR -bQ +FL lt lt lt @@ -2648,16 +2638,16 @@ TN TN TN CB -hS -hS +jQ +jQ "} (26,1,1) = {" Iv Iv -hS -hS -hS -WX +jQ +jQ +jQ +Cq lt lt lt @@ -2692,15 +2682,15 @@ TN TN TN bN -hS -hS -hS +jQ +jQ +jQ "} (27,1,1) = {" Iv Iv -hS -hS +jQ +jQ VF UY UY @@ -2737,15 +2727,15 @@ TN TN TN bN -WX -hS -hS +Cq +jQ +jQ "} (28,1,1) = {" Iv Iv -hS -ht +jQ +mV TJ TN TN @@ -2782,21 +2772,21 @@ TN TN TN CB -hS -hS +jQ +jQ Iv "} (29,1,1) = {" Iv Iv -hS -hS +jQ +jQ TJ TN TN TN jZ -hS +jQ lt lt lt @@ -2826,23 +2816,23 @@ TN TN TN CB -hS -hS -hS +jQ +jQ +jQ Iv "} (30,1,1) = {" Iv Iv -hS -hS +jQ +jQ db TN TN TN bN -WX -hS +Cq +jQ lt lt lt @@ -2870,18 +2860,18 @@ TN TN TN CB -hS -hS -hS -hS +jQ +jQ +jQ +jQ Iv "} (31,1,1) = {" Iv Iv -hS -hS -hS +jQ +jQ +jQ db EE TN @@ -2914,9 +2904,9 @@ TN TN EE CB -hS -hS -hS +jQ +jQ +jQ Iv Iv Iv @@ -2925,10 +2915,10 @@ Iv Iv Iv lt -hS -hS -hS -WX +jQ +jQ +jQ +Cq TJ TN TN @@ -2957,10 +2947,10 @@ EE EE EE CB -hS -hS -hS -hS +jQ +jQ +jQ +jQ Iv Iv Iv @@ -2971,9 +2961,9 @@ Iv lt lt lt -hS -hS -hS +jQ +jQ +jQ db TN TN @@ -2997,14 +2987,14 @@ EE EE EE CB -hS -hS -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv Iv @@ -3017,9 +3007,9 @@ Iv Iv Iv Iv -hS -hS -hS +jQ +jQ +jQ db EE TN @@ -3036,19 +3026,19 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -ay -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ +jQ +Wb +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv Iv @@ -3063,15 +3053,15 @@ Iv Iv lt lt -hS -hS -hS -hS +jQ +jQ +jQ +jQ db EE EE CB -hS +jQ lt lt lt @@ -3079,17 +3069,17 @@ lt lt lt lt -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv Iv @@ -3109,16 +3099,16 @@ lt lt lt lt -hS -hS -hS -kl -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +xC +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv Iv @@ -3155,13 +3145,13 @@ Iv Iv Iv Iv -hS -hS -hS -hS -hS -hS -hS +jQ +jQ +jQ +jQ +jQ +jQ +jQ Iv Iv Iv diff --git a/_maps/shuttles/independent/independent_lagoon.dmm b/_maps/shuttles/independent/independent_lagoon.dmm index 2855c6e0d686..6ef4d8035080 100644 --- a/_maps/shuttles/independent/independent_lagoon.dmm +++ b/_maps/shuttles/independent/independent_lagoon.dmm @@ -87,6 +87,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4, /turf/open/floor/pod/light, /area/ship/hallway/port) +"av" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/effect/turf_decal/weather/sand, +/obj/machinery/light/directional/west, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "az" = ( /obj/machinery/door/poddoor/preopen{ id = "cruisebridge" @@ -426,6 +432,10 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"cL" = ( +/obj/structure/flora/ausbushes/brflowers, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "cM" = ( /obj/machinery/button/door{ dir = 4; @@ -477,9 +487,6 @@ }, /turf/open/floor/pod/dark, /area/ship/hallway/port) -"cP" = ( -/turf/open/floor/grass, -/area/ship/hallway/central) "cR" = ( /obj/machinery/computer/arcade/battle, /obj/machinery/firealarm/directional/north, @@ -553,6 +560,10 @@ /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/starboard) +"dA" = ( +/obj/item/toy/seashell, +/turf/open/floor/plating/asteroid/sand/ship, +/area/ship/hallway/central) "dF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 1 @@ -591,9 +602,6 @@ }, /turf/open/floor/wood, /area/ship/crew/canteen) -"dN" = ( -/turf/open/floor/plating/beach/water, -/area/ship/hallway/central) "dP" = ( /obj/effect/turf_decal/corner/opaque/white/border{ dir = 1 @@ -641,6 +649,11 @@ /obj/machinery/light/directional/west, /turf/open/floor/plasteel/stairs, /area/ship/bridge) +"ee" = ( +/obj/effect/turf_decal/weather/sand, +/obj/machinery/light/directional/east, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "ef" = ( /obj/item/kirbyplants/photosynthetic, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -665,6 +678,12 @@ /obj/structure/chair, /turf/open/floor/plasteel, /area/ship/external) +"es" = ( +/obj/structure/flora/tree/jungle/small{ + randomize_icon = 0 + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "et" = ( /obj/machinery/atmospherics/pipe/simple/cyan/visible{ dir = 4 @@ -808,12 +827,6 @@ /obj/machinery/light/directional/west, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"fs" = ( -/obj/structure/flora/tree/jungle/small{ - randomize_icon = 0 - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "fu" = ( /obj/structure/cable{ icon_state = "0-8" @@ -879,6 +892,10 @@ }, /turf/open/floor/plasteel/telecomms_floor, /area/ship/bridge) +"fH" = ( +/obj/item/reagent_containers/spray/spraytan, +/turf/open/floor/plating/asteroid/sand/ship, +/area/ship/hallway/central) "fI" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /turf/open/floor/plating, @@ -937,12 +954,6 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel, /area/ship/hallway/port) -"gf" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/effect/turf_decal/weather/sand, -/obj/machinery/light/directional/west, -/turf/open/floor/grass, -/area/ship/hallway/central) "gn" = ( /obj/structure/railing{ dir = 8; @@ -1009,10 +1020,6 @@ /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/port) -"gM" = ( -/obj/structure/chair/comfy/grey/directional/east, -/turf/open/floor/grass, -/area/ship/hallway/central) "gR" = ( /obj/structure/sign/barsign{ pixel_y = 32 @@ -1092,6 +1099,17 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) +"hp" = ( +/obj/structure/flora/ausbushes/ppflowers, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) +"hq" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/chair/pew/left{ + dir = 4 + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "hr" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1233,11 +1251,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"id" = ( -/obj/effect/turf_decal/weather/sand, -/obj/machinery/light/directional/east, -/turf/open/floor/grass, -/area/ship/hallway/central) "ie" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden/layer2{ dir = 8 @@ -1410,6 +1423,19 @@ }, /turf/open/floor/wood, /area/ship/crew/library) +"je" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "jf" = ( /obj/structure/cable{ icon_state = "4-8" @@ -1495,10 +1521,6 @@ }, /turf/open/floor/wood, /area/ship/crew) -"jI" = ( -/obj/item/toy/seashell, -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) "jM" = ( /obj/machinery/libraryscanner, /obj/machinery/newscaster/directional/east, @@ -1868,6 +1890,10 @@ }, /turf/open/floor/wood, /area/ship/bridge) +"mn" = ( +/obj/effect/turf_decal/weather/sand, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "mp" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -1924,6 +1950,11 @@ /obj/effect/turf_decal/corner/opaque/lightgrey/full, /turf/open/floor/plasteel/patterned/cargo_one, /area/ship/cargo) +"mH" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/effect/turf_decal/weather/sand, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "mJ" = ( /obj/machinery/atmospherics/pipe/layer_manifold{ dir = 4 @@ -2125,6 +2156,19 @@ }, /turf/open/floor/plasteel/tech/techmaint, /area/ship/engineering) +"oi" = ( +/obj/machinery/airalarm/directional/north, +/obj/structure/table/wood, +/obj/item/storage/bag/easterbasket{ + pixel_x = 5; + pixel_y = 9 + }, +/obj/item/reagent_containers/food/snacks/egg{ + pixel_x = -8; + pixel_y = 4 + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "oj" = ( /obj/structure/cable{ icon_state = "1-8" @@ -2164,6 +2208,10 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel, /area/ship/hallway/port) +"ow" = ( +/obj/structure/chair/comfy/grey/directional/east, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "oz" = ( /obj/machinery/door/airlock/titanium{ name = "Cabin 5" @@ -2474,6 +2522,12 @@ /obj/machinery/airalarm/directional/west, /turf/open/floor/plasteel/dark, /area/ship/security) +"qi" = ( +/obj/structure/chair/pew/right{ + dir = 4 + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "ql" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -2518,9 +2572,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"qx" = ( -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) "qA" = ( /obj/structure/chair{ dir = 1 @@ -2730,6 +2781,10 @@ /obj/structure/flora/rock/icy, /turf/open/floor/grass/fairy, /area/ship/hallway/aft) +"rS" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "rV" = ( /obj/machinery/light/directional/east, /obj/machinery/vending/cigarette/beach, @@ -2738,6 +2793,11 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/port) +"rZ" = ( +/obj/structure/flora/ausbushes/ppflowers, +/obj/effect/turf_decal/weather/sand, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "sa" = ( /obj/structure/railing/corner, /obj/effect/turf_decal/siding/thinplating/dark{ @@ -2873,9 +2933,6 @@ /obj/machinery/airalarm/directional/north, /turf/open/floor/light/colour_cycle/dancefloor_b, /area/ship/storage) -"ta" = ( -/turf/open/floor/plating/beach/coastline_t, -/area/ship/hallway/central) "tb" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/dorm) @@ -2957,12 +3014,6 @@ /obj/effect/turf_decal/siding/thinplating/dark, /turf/open/floor/plasteel, /area/ship/external) -"tD" = ( -/obj/structure/chair/pew/right{ - dir = 4 - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "tH" = ( /obj/structure/cable{ icon_state = "1-4" @@ -3020,12 +3071,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/aft) -"uf" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/chair/comfy/grey/directional/east, -/obj/item/radio/intercom/directional/north, -/turf/open/floor/grass, -/area/ship/hallway/central) "um" = ( /obj/structure/cable{ icon_state = "1-8" @@ -3399,6 +3444,10 @@ "wI" = ( /turf/closed/wall/mineral/titanium, /area/ship/crew/dorm) +"wO" = ( +/obj/structure/mineral_door/sandstone, +/turf/open/floor/plating/asteroid/sand/ship, +/area/ship/hallway/central) "wP" = ( /obj/structure/bed, /obj/item/bedsheet/black, @@ -3422,10 +3471,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"wV" = ( -/obj/structure/mineral_door/sandstone, -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) "wX" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 1 @@ -3506,13 +3551,6 @@ /obj/machinery/smartfridge/food, /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew/hydroponics) -"xz" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "xA" = ( /obj/structure/cable{ icon_state = "1-2" @@ -3580,6 +3618,23 @@ "xZ" = ( /turf/closed/wall/mineral/titanium, /area/ship/engineering) +"yb" = ( +/obj/structure/flora/ausbushes/ywflowers, +/obj/structure/cable{ + icon_state = "0-2" + }, +/obj/machinery/power/apc/auto_name/directional/north, +/obj/machinery/light_switch{ + pixel_x = -13; + pixel_y = 23 + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) +"yc" = ( +/obj/structure/flora/tree/palm, +/obj/effect/overlay/coconut, +/turf/open/floor/plating/asteroid/sand/ship, +/area/ship/hallway/central) "yf" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 4 @@ -3788,10 +3843,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"zf" = ( -/obj/structure/flora/ausbushes/ppflowers, -/turf/open/floor/grass, -/area/ship/hallway/central) "zs" = ( /obj/structure/table/reinforced, /obj/item/reagent_containers/food/snacks/burger/fish, @@ -3803,6 +3854,9 @@ /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/starboard) +"zE" = ( +/turf/open/water/ship, +/area/ship/hallway/central) "zI" = ( /turf/open/floor/pod/light, /area/ship/hallway/port) @@ -3819,18 +3873,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"zP" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "zQ" = ( /obj/structure/table/reinforced, /obj/effect/turf_decal/siding/wood/end{ @@ -3858,13 +3900,6 @@ /obj/item/radio/intercom/directional/north, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"zW" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/structure/chair/pew/left{ - dir = 4 - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "zX" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -3989,10 +4024,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"AI" = ( -/obj/machinery/light/directional/south, -/turf/open/floor/plating/beach/water, -/area/ship/hallway/central) "AR" = ( /obj/structure/railing{ dir = 1 @@ -4110,23 +4141,6 @@ /obj/machinery/door/window/eastright, /turf/open/floor/plating, /area/ship/engineering) -"BB" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/grass, -/area/ship/hallway/central) -"BI" = ( -/obj/structure/flora/ausbushes/ywflowers, -/turf/open/floor/grass, -/area/ship/hallway/central) "BO" = ( /obj/machinery/door/airlock/public/glass, /obj/structure/cable{ @@ -4406,6 +4420,10 @@ /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/aft) +"DN" = ( +/obj/structure/flora/ausbushes/ywflowers, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "DP" = ( /obj/machinery/atmospherics/pipe/simple/green/visible, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ @@ -4416,6 +4434,13 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"DQ" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "DS" = ( /obj/structure/table/optable, /obj/machinery/defibrillator_mount/loaded{ @@ -4472,19 +4497,6 @@ /obj/effect/turf_decal/siding/wood, /turf/open/floor/wood, /area/ship/crew/library) -"Eg" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/mob/living/simple_animal/chick, -/turf/open/floor/grass, -/area/ship/hallway/central) "Ej" = ( /obj/structure/table/wood/poker, /obj/item/toy/cards/deck, @@ -4505,6 +4517,14 @@ /obj/effect/turf_decal/siding/wood/end, /turf/open/floor/wood, /area/ship/crew) +"Em" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/effect/turf_decal/siding/wood{ + dir = 6 + }, +/turf/open/floor/wood, +/area/ship/crew) "Er" = ( /obj/structure/table/reinforced, /obj/item/table_bell, @@ -4583,6 +4603,11 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/library) +"EI" = ( +/turf/open/water/ship{ + icon_state = "sandwater_t" + }, +/area/ship/hallway/central) "EM" = ( /obj/machinery/advanced_airlock_controller{ pixel_x = 25 @@ -4823,10 +4848,11 @@ /obj/structure/curtain/bounty, /turf/open/floor/plating, /area/ship/crew/office) -"Gw" = ( -/obj/structure/flora/ausbushes/ppflowers, -/obj/effect/turf_decal/weather/sand, -/turf/open/floor/grass, +"Gt" = ( +/obj/structure/flora/ausbushes/sparsegrass, +/obj/structure/chair/comfy/grey/directional/east, +/obj/item/radio/intercom/directional/north, +/turf/open/floor/grass/ship, /area/ship/hallway/central) "GA" = ( /obj/structure/disposalpipe/segment{ @@ -4871,14 +4897,6 @@ /obj/effect/turf_decal/corner/opaque/black/border, /turf/open/floor/plasteel, /area/ship/hallway/aft) -"GN" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/effect/turf_decal/siding/wood{ - dir = 4 - }, -/turf/open/floor/wood, -/area/ship/crew) "GO" = ( /obj/machinery/suit_storage_unit/standard_unit, /obj/effect/turf_decal/corner/opaque/lightgrey/border{ @@ -5107,6 +5125,10 @@ }, /turf/open/floor/wood, /area/ship/bridge) +"IF" = ( +/obj/item/clothing/shoes/sandal, +/turf/open/floor/plating/asteroid/sand/ship, +/area/ship/hallway/central) "IG" = ( /obj/structure/closet/crate{ name = "food crate" @@ -5133,6 +5155,12 @@ /obj/machinery/light/directional/west, /turf/open/floor/wood, /area/ship/crew/canteen) +"IM" = ( +/obj/structure/cable{ + icon_state = "1-2" + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "IX" = ( /obj/structure/disposalpipe/segment{ dir = 8 @@ -5293,6 +5321,18 @@ "JJ" = ( /turf/open/floor/carpet/black, /area/ship/crew/office) +"JL" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "JN" = ( /obj/machinery/vending/wardrobe/jani_wardrobe, /turf/open/floor/plating, @@ -5327,10 +5367,6 @@ }, /turf/open/floor/plasteel, /area/ship/crew/janitor) -"Kd" = ( -/obj/item/toy/beach_ball, -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) "Kh" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -5405,6 +5441,9 @@ /obj/item/radio/intercom/directional/east, /turf/open/floor/pod/light, /area/ship/hallway/fore) +"KN" = ( +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "KO" = ( /turf/closed/wall/mineral/titanium/nodiagonal, /area/ship/crew) @@ -5496,10 +5535,6 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/carpet, /area/ship/crew/chapel) -"LD" = ( -/obj/item/reagent_containers/spray/spraytan, -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) "LF" = ( /obj/machinery/atmospherics/pipe/simple/green/visible{ dir = 10 @@ -5523,19 +5558,6 @@ /obj/machinery/light/directional/north, /turf/open/floor/plating, /area/ship/cargo) -"LV" = ( -/obj/structure/flora/ausbushes/brflowers, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "Md" = ( /obj/machinery/power/generator{ dir = 4 @@ -5600,10 +5622,9 @@ /obj/structure/closet/radiation, /turf/open/floor/plating, /area/ship/engineering) -"Mx" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/effect/turf_decal/weather/sand, -/turf/open/floor/grass, +"Ms" = ( +/obj/item/toy/beach_ball, +/turf/open/floor/plating/asteroid/sand/ship, /area/ship/hallway/central) "My" = ( /obj/effect/turf_decal/corner/opaque/white/border{ @@ -6153,14 +6174,6 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/port) -"QI" = ( -/obj/structure/bed, -/obj/effect/spawner/random/bedsheet, -/obj/effect/turf_decal/siding/wood{ - dir = 6 - }, -/turf/open/floor/wood, -/area/ship/crew) "QJ" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -6417,9 +6430,6 @@ }, /turf/open/floor/wood, /area/ship/crew/hydroponics) -"RR" = ( -/turf/open/floor/plating/beach/coastline_b, -/area/ship/hallway/central) "RS" = ( /obj/structure/window/plasma/reinforced/spawner/west, /obj/structure/window/plasma/reinforced/spawner/north, @@ -6525,6 +6535,19 @@ }, /turf/open/floor/plasteel/white, /area/ship/medical) +"SF" = ( +/obj/structure/flora/ausbushes/brflowers, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "SH" = ( /obj/structure/table/wood, /obj/effect/turf_decal/siding/wood, @@ -6548,6 +6571,14 @@ }, /turf/open/floor/plating, /area/ship/crew/janitor) +"SS" = ( +/obj/structure/bed, +/obj/effect/spawner/random/bedsheet, +/obj/effect/turf_decal/siding/wood{ + dir = 4 + }, +/turf/open/floor/wood, +/area/ship/crew) "ST" = ( /obj/structure/disposalpipe/segment, /obj/structure/cable{ @@ -6594,10 +6625,6 @@ /obj/machinery/airalarm/directional/east, /turf/open/floor/plasteel, /area/ship/hallway/aft) -"Tt" = ( -/obj/effect/turf_decal/weather/sand, -/turf/open/floor/grass, -/area/ship/hallway/central) "Tw" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6802,6 +6829,9 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"Uz" = ( +/turf/open/floor/plating/asteroid/sand/ship, +/area/ship/hallway/central) "UE" = ( /obj/machinery/door/airlock/security{ req_access = list(1) @@ -6888,18 +6918,16 @@ }, /turf/open/floor/plating, /area/ship/engineering) +"Ve" = ( +/obj/machinery/light/directional/south, +/turf/open/water/ship, +/area/ship/hallway/central) "Vg" = ( /obj/structure/table/reinforced, /obj/machinery/microwave, /obj/effect/turf_decal/corner/opaque/white/diagonal, /turf/open/floor/plasteel, /area/ship/crew/canteen/kitchen) -"Vi" = ( -/obj/structure/cable{ - icon_state = "1-2" - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "Vl" = ( /obj/structure/cable{ icon_state = "1-2" @@ -6937,21 +6965,6 @@ }, /turf/open/floor/circuit, /area/ship/hallway/fore) -"VE" = ( -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 4 - }, -/obj/structure/cable{ - icon_state = "4-8" - }, -/obj/structure/cable{ - icon_state = "1-8" - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "VF" = ( /obj/machinery/door/airlock/external{ dir = 4 @@ -7141,6 +7154,19 @@ }, /turf/open/floor/plasteel, /area/ship/hallway/aft) +"WN" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/mob/living/simple_animal/chick, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "WR" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 1 @@ -7158,10 +7184,6 @@ /obj/effect/turf_decal/corner/opaque/white/border, /turf/open/floor/plasteel, /area/ship/hallway/fore) -"WW" = ( -/obj/structure/flora/ausbushes/brflowers, -/turf/open/floor/grass, -/area/ship/hallway/central) "WX" = ( /obj/machinery/suit_storage_unit/security, /obj/structure/cable{ @@ -7257,6 +7279,21 @@ /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/plasteel, /area/ship/crew/janitor) +"Xp" = ( +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 4 + }, +/obj/structure/cable{ + icon_state = "4-8" + }, +/obj/structure/cable{ + icon_state = "1-8" + }, +/turf/open/floor/grass/ship, +/area/ship/hallway/central) "Xs" = ( /obj/structure/closet/secure_closet/personal/cabinet, /obj/item/clothing/under/suit/black/female, @@ -7275,28 +7312,16 @@ }, /turf/open/floor/wood, /area/ship/crew/chapel) +"XB" = ( +/turf/open/water/ship{ + icon_state = "sandwater_b" + }, +/area/ship/hallway/central) "XC" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/machinery/newscaster/directional/east, /turf/open/floor/carpet/black, /area/ship/crew) -"XI" = ( -/obj/structure/flora/ausbushes/sparsegrass, -/turf/open/floor/grass, -/area/ship/hallway/central) -"XM" = ( -/obj/machinery/airalarm/directional/north, -/obj/structure/table/wood, -/obj/item/storage/bag/easterbasket{ - pixel_x = 5; - pixel_y = 9 - }, -/obj/item/reagent_containers/food/snacks/egg{ - pixel_x = -8; - pixel_y = 4 - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "XV" = ( /obj/item/kirbyplants/photosynthetic, /turf/open/floor/carpet/nanoweave/blue, @@ -7346,18 +7371,6 @@ }, /turf/open/floor/carpet/black, /area/ship/crew/dorm) -"Yh" = ( -/obj/structure/flora/ausbushes/ywflowers, -/obj/structure/cable{ - icon_state = "0-2" - }, -/obj/machinery/power/apc/auto_name/directional/north, -/obj/machinery/light_switch{ - pixel_x = -13; - pixel_y = 23 - }, -/turf/open/floor/grass, -/area/ship/hallway/central) "Yl" = ( /obj/structure/cable{ icon_state = "2-4" @@ -7489,15 +7502,6 @@ }, /turf/open/floor/wood, /area/ship/crew/dorm) -"Zx" = ( -/obj/structure/flora/tree/palm, -/obj/effect/overlay/coconut, -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) -"ZA" = ( -/obj/item/clothing/shoes/sandal, -/turf/open/floor/plating/beach/sand, -/area/ship/hallway/central) "ZH" = ( /obj/machinery/atmospherics/components/trinary/mixer/airmix/flipped/inverse{ dir = 1; @@ -8306,9 +8310,9 @@ pZ Qy Hx jC -GN +SS EX -QI +Em Kl IX uD @@ -8429,9 +8433,9 @@ Tz Qy Tf jC -GN +SS EX -QI +Em Kl FW yf @@ -8676,7 +8680,7 @@ Qy kl Kl RH -GN +SS dG Kl IX @@ -8838,7 +8842,7 @@ kv FX Pw Pw -wV +wO Pw Pw Pw @@ -8872,17 +8876,17 @@ vy vy vy cS -XM -tD -zW -LV -cP -gf -qx -Kd -ta -RR -AI +oi +qi +hq +SF +KN +av +Uz +Ms +EI +XB +Ve Pw on Bo @@ -8913,17 +8917,17 @@ SK SK SK RM -WW -cP -cP -BB -cP -Mx -Zx -qx -ta -RR -dN +cL +KN +KN +je +KN +mH +yc +Uz +EI +XB +zE Pw wU rI @@ -8954,17 +8958,17 @@ CD CD CD TH -cP -XI -fs -Eg -cP -Tt -qx -qx -ta -RR -dN +KN +rS +es +WN +KN +mn +Uz +Uz +EI +XB +zE Pw yn rI @@ -8995,17 +8999,17 @@ vy vy vy cS -Yh -Vi -xz -VE -cP -Gw -qx -LD -ta -RR -dN +yb +IM +DQ +Xp +KN +rZ +Uz +fH +EI +XB +zE Pw wU rI @@ -9036,17 +9040,17 @@ cS cS cS cS -uf -gM -zf -zP -BI -id -ZA -jI -ta -RR -AI +Gt +ow +hp +JL +DN +ee +IF +dA +EI +XB +Ve Pw zX hN diff --git a/code/__DEFINES/colors.dm b/code/__DEFINES/colors.dm index 5c6f14c887eb..9e29c3bf2379 100644 --- a/code/__DEFINES/colors.dm +++ b/code/__DEFINES/colors.dm @@ -173,3 +173,14 @@ /// Color used for default blood #define COLOR_BLOOD "#CC0000" + + +/*Planetary color defines*/ + +#define COLOR_BEACHPLANET_LIGHT "#faeacb" +#define COLOR_ICEPLANET_LIGHT "#e1d1e6" +#define COLOR_LAVAPLANET_LIGHT "#f5b85d" +#define COLOR_JUNGLEPLANET_LIGHT "#b39981" +#define COLOR_ROCKPLANET_LIGHT "#db9e9f" +#define COLOR_SANDPLANET_LIGHT "#EEEEEE" //EEEEEEEEEE +#define COLOR_WASTEPLANET_LIGHT "#FA644B" diff --git a/code/datums/mapgen/single_biome/WasteplanetCaves.dm b/code/datums/mapgen/single_biome/WasteplanetCaves.dm deleted file mode 100644 index 3caf1c9429ad..000000000000 --- a/code/datums/mapgen/single_biome/WasteplanetCaves.dm +++ /dev/null @@ -1,67 +0,0 @@ -/datum/map_generator/single_biome/wasteplanet - initial_closed_chance = 45 - smoothing_iterations = 50 - birth_limit = 4 - death_limit = 3 - - biome_type = /datum/biome/cave/wasteplanet - area_type = /area/overmap_encounter/planetoid/wasteplanet - -/datum/biome/cave/wasteplanet - open_turf_types = list(/turf/open/floor/plating/asteroid/wasteplanet = 50, - /turf/open/floor/plating/rust/wasteplanet = 10, - /turf/open/floor/plating/wasteplanet = 5) - closed_turf_types = list(/turf/closed/mineral/random/wasteplanet = 45, - /turf/closed/wall/rust = 10,) - - flora_spawn_list = list( - /obj/structure/mecha_wreckage/ripley = 15, - /obj/structure/mecha_wreckage/ripley/firefighter = 9, - /obj/structure/mecha_wreckage/ripley/mkii = 9, - /obj/structure/girder = 60, - /obj/structure/reagent_dispensers/fueltank = 30, - /obj/item/stack/cable_coil/cut = 30, - /obj/effect/decal/cleanable/greenglow = 60, - /obj/effect/decal/cleanable/glass = 30, - /obj/structure/closet/crate/secure/loot = 3, - /obj/machinery/portable_atmospherics/canister/toxins = 3, - /obj/machinery/portable_atmospherics/canister/carbon_dioxide = 3, - /obj/structure/radioactive = 6, - /obj/structure/radioactive/stack = 6, - /obj/structure/radioactive/waste = 6, - /obj/structure/flora/ash/garden/waste = 15, - /obj/structure/flora/ash/glowshroom = 90, - - /obj/structure/salvageable/machine = 20, - /obj/structure/salvageable/autolathe = 15, - /obj/structure/salvageable/computer = 10, - /obj/structure/salvageable/protolathe = 10, - /obj/structure/salvageable/circuit_imprinter = 8, - /obj/structure/salvageable/destructive_analyzer = 8, - /obj/structure/salvageable/server = 8, - /obj/item/mine/pressure/explosive/rusty/live = 30, - /obj/effect/spawner/random/mine = 8 - ) - feature_spawn_list = list( - /obj/structure/geyser/random = 1, - /obj/effect/spawner/minefield = 1 - ) - mob_spawn_list = list( - //hivebots, not too difficult - /mob/living/simple_animal/hostile/hivebot/strong/rockplanet = 70, - /mob/living/simple_animal/hostile/hivebot/range/rockplanet = 40, - /mob/living/simple_animal/hostile/hivebot/rapid/rockplanet = 30, - //crystal mobs, very difficult - /mob/living/simple_animal/hostile/asteroid/goliath/beast/ancient/crystal = 1, - /mob/living/simple_animal/hostile/asteroid/basilisk/watcher/forgotten = 1, - /mob/living/simple_animal/hostile/asteroid/hivelord/legion/crystal = 1, - //bots, are hostile - /mob/living/simple_animal/bot/firebot/rockplanet = 15, - /mob/living/simple_animal/bot/secbot/ed209/rockplanet = 3, - /mob/living/simple_animal/hostile/abandoned_minebot = 15, - /mob/living/simple_animal/bot/floorbot/rockplanet = 15, - ) - - flora_spawn_chance = 10 - feature_spawn_chance = 0.1 - mob_spawn_chance = 2 diff --git a/code/game/objects/effects/glowshroom.dm b/code/game/objects/effects/glowshroom.dm index f880b95497c4..dc9c7bcd6855 100644 --- a/code/game/objects/effects/glowshroom.dm +++ b/code/game/objects/effects/glowshroom.dm @@ -16,8 +16,8 @@ var/spreadIntoAdjacentChance = 60 var/obj/item/seeds/myseed = /obj/item/seeds/glowshroom var/static/list/blacklisted_glowshroom_turfs = typecacheof(list( - /turf/open/lava, - /turf/open/floor/plating/beach/water)) + /turf/open/lava + )) /obj/structure/glowshroom/glowcap name = "glowcap" diff --git a/code/game/turfs/open/floor/fancy_floor.dm b/code/game/turfs/open/floor/fancy_floor.dm index 3a0184849450..2d043371a9bb 100644 --- a/code/game/turfs/open/floor/fancy_floor.dm +++ b/code/game/turfs/open/floor/fancy_floor.dm @@ -135,7 +135,7 @@ icon_state = "fairygrass[rand(0,3)]" /turf/open/floor/grass/fairy/beach - baseturfs = /turf/open/floor/plating/beach/sand + baseturfs = /turf/open/floor/plating/asteroid/sand planetary_atmos = TRUE /turf/open/floor/grass/snow diff --git a/code/game/turfs/open/floor/misc_floor.dm b/code/game/turfs/open/floor/misc_floor.dm index 97f3772ec208..d38a0ca6956a 100644 --- a/code/game/turfs/open/floor/misc_floor.dm +++ b/code/game/turfs/open/floor/misc_floor.dm @@ -211,6 +211,8 @@ smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS) canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS) layer = HIGH_TURF_LAYER + icon_state = "grass0" + base_icon_state = "grass" var/smooth_icon = 'icons/turf/floors/grass.dmi' baseturfs = /turf/open/floor/ship/dirt diff --git a/code/game/turfs/open/floor/plating/beach.dm b/code/game/turfs/open/floor/plating/beach.dm index 88bb3bbcad1b..485a5cc58a8c 100644 --- a/code/game/turfs/open/floor/plating/beach.dm +++ b/code/game/turfs/open/floor/plating/beach.dm @@ -1,13 +1,15 @@ +///it's all sand.... + /turf/open/floor/plating/asteroid/sand name = "sand" icon = 'icons/misc/beach.dmi' icon_state = "sand" base_icon_state = "sand" baseturfs = /turf/open/floor/plating/asteroid/sand - initial_gas_mix = OPENTURF_DEFAULT_ATMOS //custom atmos? lots of oxygen, hot? - digResult = /obj/item/stack/ore/glass + initial_gas_mix = OPENTURF_DEFAULT_ATMOS planetary_atmos = TRUE digResult = /obj/item/stack/ore/glass/beach + light_color = COLOR_BEACHPLANET_LIGHT /turf/open/floor/plating/asteroid/sand/Initialize(mapload, inherited_virtual_z) . = ..() @@ -16,14 +18,20 @@ /turf/open/floor/plating/asteroid/sand/lit light_range = 2 light_power = 0.80 - light_color = LIGHT_COLOR_TUNGSTEN /turf/open/floor/plating/asteroid/sand/dense icon_state = "light_sand" - planetary_atmos = TRUE base_icon_state = "light_sand" /turf/open/floor/plating/asteroid/sand/dense/lit light_range = 2 light_power = 0.80 - light_color = LIGHT_COLOR_TUNGSTEN + +/turf/open/floor/plating/grass/beach + baseturfs = /turf/open/floor/plating/asteroid/sand + light_color = COLOR_BEACHPLANET_LIGHT + planetary_atmos = TRUE + +/turf/open/floor/plating/grass/beach/lit + light_range = 2 + light_power = 0.80 diff --git a/code/game/turfs/open/floor/plating/icemoon.dm b/code/game/turfs/open/floor/plating/icemoon.dm index 0fd0d95faed3..12a1c340edfa 100644 --- a/code/game/turfs/open/floor/plating/icemoon.dm +++ b/code/game/turfs/open/floor/plating/icemoon.dm @@ -17,6 +17,7 @@ bullet_sizzle = TRUE bullet_bounce_sound = null digResult = /obj/item/stack/sheet/mineral/snow + light_color = COLOR_ICEPLANET_LIGHT // footprint vars var/entered_dirs var/exited_dirs @@ -87,19 +88,17 @@ . = ..() ScrapeAway() +/turf/open/floor/plating/asteroid/snow/icemoon + baseturfs = /turf/open/openspace/icemoon + initial_gas_mix = ICEMOON_DEFAULT_ATMOS + + slowdown = 0 + /turf/open/floor/plating/asteroid/snow/lit light_range = 2 light_power = 1 baseturfs = /turf/open/floor/plating/asteroid/icerock/lit -/turf/open/floor/plating/asteroid/snow/lit/whitesands - baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit - initial_gas_mix = WHITESANDS_ATMOS - -/turf/open/floor/plating/asteroid/snow/lit/rockplanet - baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit - initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS - /turf/open/floor/plating/asteroid/snow/airless initial_gas_mix = AIRLESS_ATMOS @@ -142,6 +141,7 @@ floor_variance = 100 max_icon_states = 7 dug = TRUE + light_color = COLOR_ICEPLANET_LIGHT /turf/open/floor/plating/asteroid/icerock/lit light_range = 2 @@ -183,21 +183,17 @@ floor_variance = 100 max_icon_states = 7 dug = TRUE + light_color = COLOR_ICEPLANET_LIGHT /turf/open/floor/plating/asteroid/iceberg/lit light_range = 2 light_power = 1 - -/turf/open/floor/plating/asteroid/snow/icemoon - baseturfs = /turf/open/openspace/icemoon - initial_gas_mix = ICEMOON_DEFAULT_ATMOS - slowdown = 0 - /turf/open/lava/plasma/ice_moon initial_gas_mix = ICEMOON_DEFAULT_ATMOS baseturfs = /turf/open/lava/plasma/ice_moon planetary_atmos = TRUE + light_color = COLOR_ICEPLANET_LIGHT /turf/open/floor/plating/asteroid/snow/ice name = "icy snow" @@ -213,6 +209,8 @@ clawfootstep = FOOTSTEP_HARD_CLAW heavyfootstep = FOOTSTEP_GENERIC_HEAVY max_icon_states = 7 + light_color = COLOR_ICEPLANET_LIGHT + /turf/open/floor/plating/asteroid/snow/ice/icemoon baseturfs = /turf/open/floor/plating/asteroid/snow/ice/icemoon diff --git a/code/game/turfs/open/floor/plating/jungle.dm b/code/game/turfs/open/floor/plating/jungle.dm new file mode 100644 index 000000000000..79121704001c --- /dev/null +++ b/code/game/turfs/open/floor/plating/jungle.dm @@ -0,0 +1,57 @@ +/turf/open/floor/plating/dirt/jungle + slowdown = 0.5 + baseturfs = /turf/open/floor/plating/dirt/jungle + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + light_color = COLOR_JUNGLEPLANET_LIGHT + +/turf/open/floor/plating/dirt/jungle/lit + baseturfs = /turf/open/floor/plating/dirt/jungle/lit + light_range = 2 + light_power = 1 + +/turf/open/floor/plating/dirt/jungle/dark + icon_state = "greenerdirt" + baseturfs = /turf/open/floor/plating/dirt/jungle/dark + +/turf/open/floor/plating/dirt/jungle/dark/lit + light_range = 2 + light_power = 1 + +/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona. + name = "cracked earth" + desc = "Looks a bit dry." + icon = 'icons/turf/floors.dmi' + icon_state = "wasteland" + slowdown = 1 + baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland + var/floor_variance = 15 + +/turf/open/floor/plating/dirt/jungle/wasteland/lit + baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit + light_range = 2 + light_power = 1 + +/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z) + .=..() + if(prob(floor_variance)) + icon_state = "[initial(icon_state)][rand(0,12)]" + +/turf/open/floor/plating/grass/jungle + name = "jungle grass" + planetary_atmos = TRUE + desc = "Greener on the other side." + icon_state = "junglegrass" + base_icon_state = "junglegrass" + smooth_icon = 'icons/turf/floors/junglegrass.dmi' + baseturfs = /turf/open/floor/plating/grass/jungle + light_color = COLOR_JUNGLEPLANET_LIGHT + +/turf/open/floor/plating/grass/jungle/lit + baseturfs = /turf/open/floor/plating/dirt/jungle/lit + light_range = 2 + light_power = 1 + +/turf/open/water/jungle/lit + light_range = 2 + light_power = 0.8 + light_color = LIGHT_COLOR_BLUEGREEN diff --git a/code/game/turfs/open/floor/plating/lavaland.dm b/code/game/turfs/open/floor/plating/lavaland.dm index 84e0173819b7..b15f76eabcc2 100644 --- a/code/game/turfs/open/floor/plating/lavaland.dm +++ b/code/game/turfs/open/floor/plating/lavaland.dm @@ -1,3 +1,5 @@ +///baseturf + /turf/open/floor/plating/asteroid/basalt name = "volcanic floor" baseturfs = /turf/open/floor/plating/asteroid/basalt @@ -7,11 +9,11 @@ base_icon_state = "basalt" floor_variance = 15 digResult = /obj/item/stack/ore/glass/basalt + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/asteroid/basalt/lava_land_surface/lit light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE /turf/open/floor/plating/asteroid/basalt/lava //lava underneath baseturfs = /turf/open/lava/smooth @@ -26,11 +28,9 @@ /proc/set_basalt_light(turf/open/floor/B) switch(B.icon_state) if("basalt1", "basalt2", "basalt3") - B.set_light(2, 0.6, LIGHT_COLOR_LAVA) //more light + B.set_light(2, 0.6, COLOR_LAVAPLANET_LIGHT) //more light if("basalt5", "basalt9") - B.set_light(1.4, 0.6, LIGHT_COLOR_LAVA) //barely anything! - -///////Surface. The surface is warm, but survivable without a suit. Internals are required. The floors break to chasms, which drop you into the underground. + B.set_light(1.4, 0.6, COLOR_LAVAPLANET_LIGHT) //barely anything! /turf/open/floor/plating/asteroid/basalt/lava_land_surface initial_gas_mix = LAVALAND_DEFAULT_ATMOS @@ -47,7 +47,8 @@ /turf/open/floor/plating/asteroid/basalt/purple/lit light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + +///Sand /turf/open/floor/plating/asteroid/purple name = "ashen sand" @@ -57,11 +58,13 @@ turf_type = /turf/open/floor/plating/asteroid/basalt/purple initial_gas_mix = LAVALAND_DEFAULT_ATMOS planetary_atmos = TRUE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/asteroid/purple/lit light_range = 2 light_power = 0.3 - light_color = LIGHT_COLOR_FIRE + +///Grass /turf/open/floor/plating/grass/lava name = "ungodly grass" @@ -75,7 +78,7 @@ smooth_icon = 'icons/turf/floors/lava_grass_red.dmi' light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT gender = PLURAL /turf/open/floor/plating/grass/lava/orange @@ -88,44 +91,68 @@ icon = 'icons/turf/floors/lava_grass_purple.dmi' smooth_icon = 'icons/turf/floors/lava_grass_purple.dmi' +///The Moss +/turf/open/floor/plating/moss + name = "mossy carpet" + desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash." + baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss + initial_gas_mix = LAVALAND_DEFAULT_ATMOS + planetary_atmos = TRUE + icon_state = "moss" + icon = 'icons/turf/lava_moss.dmi' + base_icon_state = "moss" + bullet_bounce_sound = null + footstep = FOOTSTEP_GRASS + barefootstep = FOOTSTEP_GRASS + clawfootstep = FOOTSTEP_GRASS + heavyfootstep = FOOTSTEP_GENERIC_HEAVY + layer = HIGH_TURF_LAYER + gender = PLURAL + light_power = 1 + light_range = 2 + pixel_x = -9 + pixel_y = -9 + +///Ruin Turfs (to-do, move all ruin turfs into their own bespoke files) + /turf/open/floor/concrete/pavement/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/concrete/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/concrete/slab_1/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plating/rust/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plasteel/white/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT /turf/open/floor/plasteel/dark/lava initial_gas_mix = LAVALAND_DEFAULT_ATMOS light_range = 2 light_power = 0.6 - light_color = LIGHT_COLOR_FIRE + light_color = COLOR_LAVAPLANET_LIGHT diff --git a/code/game/turfs/open/floor/plating/misc_plating.dm b/code/game/turfs/open/floor/plating/misc_plating.dm index 84a49d1a0038..684420c8eb89 100644 --- a/code/game/turfs/open/floor/plating/misc_plating.dm +++ b/code/game/turfs/open/floor/plating/misc_plating.dm @@ -116,61 +116,6 @@ icon_state = "[icon_state][rand(1, 9)]" . = ..() - -/turf/open/floor/plating/beach - name = "beach" - icon = 'icons/misc/beach.dmi' - flags_1 = NONE - attachment_holes = FALSE - bullet_bounce_sound = null - footstep = FOOTSTEP_SAND - barefootstep = FOOTSTEP_SAND - clawfootstep = FOOTSTEP_SAND - heavyfootstep = FOOTSTEP_GENERIC_HEAVY - -/turf/open/floor/plating/beach/try_replace_tile(obj/item/stack/tile/T, mob/user, params) - return - -/turf/open/floor/plating/beach/ex_act(severity, target) - contents_explosion(severity, target) - -/turf/open/floor/plating/beach/sand - gender = PLURAL - name = "sand" - desc = "Surf's up." - icon_state = "sand" - baseturfs = /turf/open/floor/plating/beach/sand - -/turf/open/floor/plating/beach/coastline_t - name = "coastline" - desc = "Tide's high tonight. Charge your batons." - icon_state = "sandwater_t" - baseturfs = /turf/open/floor/plating/beach/coastline_t - -/turf/open/floor/plating/beach/coastline_b //need to make this water subtype. - name = "coastline" - icon_state = "sandwater_b" - baseturfs = /turf/open/floor/plating/beach/coastline_b - footstep = FOOTSTEP_LAVA - barefootstep = FOOTSTEP_LAVA - clawfootstep = FOOTSTEP_LAVA - heavyfootstep = FOOTSTEP_LAVA - -/turf/open/floor/plating/beach/water - gender = PLURAL - name = "water" - desc = "You get the feeling that nobody's bothered to actually make this water functional..." - icon_state = "water" - baseturfs = /turf/open/floor/plating/beach/water - footstep = FOOTSTEP_LAVA //placeholder, kinda. - barefootstep = FOOTSTEP_LAVA - clawfootstep = FOOTSTEP_LAVA - heavyfootstep = FOOTSTEP_LAVA - -/turf/open/floor/plating/beach/coastline_t/sandwater_inner - icon_state = "sandwater_inner" - baseturfs = /turf/open/floor/plating/beach/coastline_t/sandwater_inner - /turf/open/floor/plating/ironsand gender = PLURAL name = "iron sand" @@ -331,33 +276,3 @@ heavyfootstep = FOOTSTEP_GENERIC_HEAVY tiled_dirt = FALSE -/turf/open/floor/plating/grass/beach - baseturfs = /turf/open/floor/plating/beach/sand - planetary_atmos = TRUE - -/turf/open/floor/plating/grass/beach/lit - light_range = 2 - light_power = 0.80 - - - -/turf/open/floor/plating/moss - name = "mossy carpet" - desc = "When the forests burned away and the sky grew dark, the moss learned to feed on the falling ash." - baseturfs = /turf/open/floor/plating/ashplanet //explosions and damage can destroy the moss - initial_gas_mix = LAVALAND_DEFAULT_ATMOS - planetary_atmos = TRUE - icon_state = "moss" - icon = 'icons/turf/lava_moss.dmi' - base_icon_state = "moss" - bullet_bounce_sound = null - footstep = FOOTSTEP_GRASS - barefootstep = FOOTSTEP_GRASS - clawfootstep = FOOTSTEP_GRASS - heavyfootstep = FOOTSTEP_GENERIC_HEAVY - layer = HIGH_TURF_LAYER - gender = PLURAL - light_power = 1 - light_range = 2 - pixel_x = -9 - pixel_y = -9 diff --git a/code/game/turfs/open/floor/plating/planet.dm b/code/game/turfs/open/floor/plating/planet.dm index a86847ca8f78..f360ac611267 100644 --- a/code/game/turfs/open/floor/plating/planet.dm +++ b/code/game/turfs/open/floor/plating/planet.dm @@ -20,70 +20,11 @@ /turf/open/floor/plating/dirt/try_replace_tile(obj/item/stack/tile/T, mob/user, params) return -/turf/open/floor/plating/dirt/jungle - slowdown = 0.5 - baseturfs = /turf/open/floor/plating/dirt/jungle - initial_gas_mix = OPENTURF_DEFAULT_ATMOS - -/turf/open/floor/plating/dirt/jungle/lit - baseturfs = /turf/open/floor/plating/dirt/jungle/lit - light_range = 2 - light_power = 1 - light_color = COLOR_VERY_LIGHT_GRAY - -/turf/open/floor/plating/dirt/jungle/dark - icon_state = "greenerdirt" - baseturfs = /turf/open/floor/plating/dirt/jungle/dark - -/turf/open/floor/plating/dirt/jungle/dark/lit - light_range = 2 - light_power = 1 - -/turf/open/floor/plating/dirt/jungle/wasteland //Like a more fun version of living in Arizona. - name = "cracked earth" - desc = "Looks a bit dry." - icon = 'icons/turf/floors.dmi' - icon_state = "wasteland" - slowdown = 1 - baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland - var/floor_variance = 15 - -/turf/open/floor/plating/dirt/jungle/wasteland/lit - baseturfs = /turf/open/floor/plating/dirt/jungle/wasteland/lit - light_range = 2 - light_power = 1 - - -/turf/open/floor/plating/dirt/jungle/wasteland/Initialize(mapload, inherited_virtual_z) - .=..() - if(prob(floor_variance)) - icon_state = "[initial(icon_state)][rand(0,12)]" - /turf/open/floor/plating/dirt/icemoon initial_gas_mix = ICEMOON_DEFAULT_ATMOS baseturfs = /turf/open/floor/plating/dirt/icemoon planetary_atmos = TRUE -/turf/open/floor/plating/grass/jungle - name = "jungle grass" - planetary_atmos = TRUE - desc = "Greener on the other side." - icon_state = "junglegrass" - base_icon_state = "junglegrass" - baseturfs = /turf/open/floor/plating/dirt/jungle - smooth_icon = 'icons/turf/floors/junglegrass.dmi' - baseturfs = /turf/open/floor/plating/grass/jungle - -/turf/open/floor/plating/grass/jungle/lit - baseturfs = /turf/open/floor/plating/dirt/jungle/lit - light_range = 2 - light_power = 1 - -/turf/open/water/jungle/lit - light_range = 2 - light_power = 0.8 - light_color = LIGHT_COLOR_BLUEGREEN - /turf/open/floor/plating/dirt/old icon_state = "oldsmoothdirt" @@ -98,8 +39,26 @@ light_power = 1 light_range = 2 - /turf/open/floor/plating/dirt/dry/lit light_power = 1 light_range = 2 + +//Artifical sand turfs +/turf/open/floor/plating/asteroid/sand/ship + name = "sand" + icon = 'icons/misc/beach.dmi' + icon_state = "sand" + base_icon_state = "sand" + baseturfs = /turf/open/floor/plating + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE + digResult = null + +//artifical water turfs +/turf/open/water/ship + icon = 'icons/misc/beach.dmi' + icon_state = "water" + base_icon_state = "water" + initial_gas_mix = OPENTURF_DEFAULT_ATMOS + planetary_atmos = FALSE diff --git a/code/game/turfs/open/floor/plating/rockplanet.dm b/code/game/turfs/open/floor/plating/rockplanet.dm index b6324ebbb3d8..9bc21c8778c6 100644 --- a/code/game/turfs/open/floor/plating/rockplanet.dm +++ b/code/game/turfs/open/floor/plating/rockplanet.dm @@ -9,11 +9,11 @@ baseturfs = /turf/open/floor/plating/asteroid/rockplanet turf_type = /turf/open/floor/plating/asteroid/rockplanet digResult = /obj/item/stack/ore/glass/rockplanet + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plating/asteroid/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/plating/asteroid/rockplanet/cracked name = "iron cracked sand" @@ -25,7 +25,6 @@ /turf/open/floor/plating/asteroid/rockplanet/cracked/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit turf_type = /turf/open/floor/plating/asteroid/rockplanet/lit @@ -45,83 +44,101 @@ /turf/open/floor/plating/asteroid/rockplanet/wet/cracked/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY + +//start crackhead subtyping (open reward of 1 erika token to anyone who untangles this somewhat) /turf/open/floor/plating/grass/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "dry grass" desc = "A patch of dry grass." /turf/open/floor/plating/dirt/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "mud" icon_state = "greenerdirt" /turf/open/water/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "pond" /turf/open/floor/plating/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT name = "exterior plating" /turf/open/floor/plating/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/plasteel/stairs/rockplanet - initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS name = "exterior stairs" + initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/engine/hull/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT + +//i hope whoever subtyped all the rockplanet tiles like this stubs their toe so hard. /turf/open/floor/plasteel/rockplanet - initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS name = "exterior floor" + initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY name = "exterior floor" /turf/open/floor/plasteel/patterned/brushed/rockplanet + name = "exterior floor" initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/brushed/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY - name = "exterior floor" /turf/open/floor/plasteel/patterned/ridged/rockplanet + name = "exterior floor" initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plasteel/patterned/ridged/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY - name = "exterior floor" /turf/open/floor/plating/rust/rockplanet + name = "exterior plating" initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/plating/rust/rockplanet/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY - name = "exterior plating" /turf/open/floor/wood/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/pod/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT /turf/open/floor/engine/hull/reinforced/rockplanet initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS + light_color = COLOR_ROCKPLANET_LIGHT + +///snow +/turf/open/floor/plating/asteroid/snow/lit/rockplanet + light_color = COLOR_ROCKPLANET_LIGHT + baseturfs = /turf/open/floor/plating/asteroid/rockplanet/lit + initial_gas_mix = ROCKPLANET_DEFAULT_ATMOS diff --git a/code/game/turfs/open/floor/plating/wasteplanet.dm b/code/game/turfs/open/floor/plating/wasteplanet.dm index d47a1fbfc6cb..6de774313697 100644 --- a/code/game/turfs/open/floor/plating/wasteplanet.dm +++ b/code/game/turfs/open/floor/plating/wasteplanet.dm @@ -1,3 +1,4 @@ +///base turf /turf/open/floor/plating/asteroid/wasteplanet name = "dry rock" @@ -9,20 +10,18 @@ planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet digResult = /obj/item/stack/ore/glass/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT -/turf/open/water/tar/waste - baseturfs = /turf/open/floor/plating/asteroid/wasteplanet - planetary_atmos = TRUE - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS +/turf/open/floor/plating/asteroid/wasteplanet/lit + light_range = 2 + light_power = 0.2 + +///plating turfs /turf/open/floor/plating/wasteplanet baseturfs = /turf/open/floor/plating/asteroid/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - -/turf/open/floor/plating/rust/wasteplanet - baseturfs = /turf/open/floor/plating/asteroid/wasteplanet - planetary_atmos = TRUE - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plating/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return @@ -35,21 +34,20 @@ /turf/open/indestructible/hierophant/waste initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/indestructible/hierophant/two/waste initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/wood/waste initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE -///Cement Turfs - /turf/open/floor/concrete/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet @@ -69,6 +67,7 @@ /turf/open/floor/concrete/reinforced/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet @@ -77,6 +76,7 @@ /turf/open/floor/concrete/pavement/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet @@ -84,22 +84,84 @@ return /turf/open/floor/plasteel/wasteplanet + baseturfs = /turf/open/floor/plating/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plasteel/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return /turf/open/floor/plasteel/dark/wasteplanet + baseturfs = /turf/open/floor/plating/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plasteel/dark/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return -//cement + +/turf/open/floor/wood/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/indestructible/hierophant/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/indestructible/hierophant/two/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + + + + +///liquids + +/turf/open/water/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/water/tar/waste + baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + planetary_atmos = TRUE + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/water/tar/waste/lit + light_range = 2 + light_power = 0.2 + +///biological-ish turfs + +/turf/open/floor/plating/grass/wasteplanet + icon_state = "junglegrass" + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/floor/plating/dirt/old/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/floor/plating/grass/wasteplanet/lit + light_range = 2 + light_power = 0.2 + +/turf/open/floor/plating/dirt/old/waste/lit + light_range = 2 + light_power = 0.2 + +///cement turfs /turf/open/floor/concrete/wasteplanet initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/concrete/wasteplanet/Initialize() . = ..() @@ -119,6 +181,7 @@ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/concrete/reinforced/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return @@ -127,90 +190,79 @@ initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS planetary_atmos = TRUE baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/concrete/pavement/wasteplanet/MakeSlippery(wet_setting, min_wet_time, wet_time_to_add, max_wet_time, permanent) return + + +///Biological Turfs + +/turf/open/floor/plating/grass/wasteplanet + icon_state = "junglegrass" + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + light_color = COLOR_WASTEPLANET_LIGHT + +/turf/open/floor/plating/dirt/old/waste + initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS + planetary_atmos = TRUE + baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT + + + + + + //open turfs then open lits. /turf/open/floor/plating/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE /turf/open/floor/plating/wasteplanet/rust/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE /turf/open/floor/plating/asteroid/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE /turf/open/water/tar/waste/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE /turf/open/floor/concrete/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/concrete/reinforced/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/concrete/pavement/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE - -///Biological Turfs - -/turf/open/floor/plating/grass/wasteplanet - icon_state = "junglegrass" - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - planetary_atmos = TRUE - -/turf/open/floor/plating/dirt/old/waste - initial_gas_mix = WASTEPLANET_DEFAULT_ATMOS - planetary_atmos = TRUE - baseturfs = /turf/open/floor/plating/asteroid/wasteplanet + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plating/dirt/old/waste/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/floor/plating/grass/wasteplanet/lit light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT /turf/open/water/waste/lit //do not drink light_range = 2 light_power = 0.2 - light_color = LIGHT_COLOR_FLARE - -//cement - -/turf/open/floor/concrete/wasteplanet/lit - light_range = 2 - light_power = 0.2 - light_color = LIGHT_COLOR_FLARE - -/turf/open/floor/concrete/reinforced/wasteplanet/lit - light_range = 2 - light_power = 0.2 - light_color = LIGHT_COLOR_FLARE - -/turf/open/floor/concrete/pavement/wasteplanet/lit - light_range = 2 - light_power = 0.2 - light_color = LIGHT_COLOR_FLARE + light_color = COLOR_WASTEPLANET_LIGHT //closed turfs are a thing /turf/closed/wall/r_wall/wasteplanet diff --git a/code/game/turfs/open/floor/plating/whitesands.dm b/code/game/turfs/open/floor/plating/whitesands.dm index 7809fc9e958b..2607d6f174c0 100644 --- a/code/game/turfs/open/floor/plating/whitesands.dm +++ b/code/game/turfs/open/floor/plating/whitesands.dm @@ -1,3 +1,5 @@ +///sand (but not like the other sand that's also called sand) + /turf/open/floor/plating/asteroid/whitesands name = "salted sand" baseturfs = /turf/open/floor/plating/asteroid/whitesands @@ -6,13 +8,13 @@ icon_plating = "sand" planetary_atmos = TRUE base_icon_state = WHITESANDS_SAND_ENV - initial_gas_mix = WHITESANDS_ATMOS //Fallback, and used to tell the AACs that this is the exterior + initial_gas_mix = WHITESANDS_ATMOS digResult = /obj/item/stack/ore/glass/whitesands + light_color = COLOR_SANDPLANET_LIGHT /turf/open/floor/plating/asteroid/whitesands/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit /turf/open/floor/plating/asteroid/whitesands/dried @@ -29,11 +31,9 @@ /turf/open/floor/plating/asteroid/whitesands/dried/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY baseturfs = /turf/open/floor/plating/asteroid/whitesands/dried/lit -/turf/open/floor/plating/grass/whitesands - initial_gas_mix = WHITESANDS_ATMOS +///basalt /turf/open/floor/plating/asteroid/basalt/whitesands initial_gas_mix = WHITESANDS_ATMOS @@ -42,11 +42,14 @@ icon_state = "whitesands_basalt0" icon_plating = "whitesands_basalt0" dug = TRUE + light_color = COLOR_SANDPLANET_LIGHT /turf/open/floor/plating/asteroid/basalt/whitesands/Initialize(mapload, inherited_virtual_z) . = ..() icon_state = "whitesands_basalt[rand(0,1)]" +///grass + /turf/open/floor/plating/asteroid/whitesands/grass name = "purple grass" desc = "The few known flora on Whitesands are in a purplish color." @@ -60,6 +63,7 @@ smoothing_flags = SMOOTH_BITMASK smoothing_groups = list(SMOOTH_GROUP_TURF_OPEN, SMOOTH_GROUP_FLOOR_GRASS) canSmoothWith = list(SMOOTH_GROUP_CLOSED_TURFS, SMOOTH_GROUP_FLOOR_GRASS) + light_color = COLOR_SANDPLANET_LIGHT /turf/open/floor/plating/asteroid/whitesands/grass/Initialize(mapload, inherited_virtual_z) . = ..() @@ -81,28 +85,49 @@ light_power = 1 light_range = 2 +///the singular snow tile: + +/turf/open/floor/plating/asteroid/snow/lit/whitesands + light_color = COLOR_SANDPLANET_LIGHT + baseturfs = /turf/open/floor/plating/asteroid/whitesands/lit + initial_gas_mix = WHITESANDS_ATMOS + /turf/open/floor/concrete/whitesands initial_gas_mix = WHITESANDS_ATMOS + light_color = COLOR_SANDPLANET_LIGHT + +/turf/open/floor/concrete/whitesands/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/concrete/reinforced/whitesands initial_gas_mix = WHITESANDS_ATMOS + light_color = COLOR_SANDPLANET_LIGHT + +/turf/open/floor/concrete/reinforced/whitesands/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/concrete/pavement/whitesands initial_gas_mix = WHITESANDS_ATMOS + light_color = COLOR_SANDPLANET_LIGHT + +/turf/open/floor/concrete/pavement/whitesands/lit light_range = 2 light_power = 0.6 - light_color = COLOR_VERY_LIGHT_GRAY /turf/open/floor/concrete/slab_1/whitesands initial_gas_mix = WHITESANDS_ATMOS - light_color = COLOR_VERY_LIGHT_GRAY + light_color = COLOR_SANDPLANET_LIGHT + +/turf/open/floor/concrete/slab_1/whitesands/lit + light_range = 2 + light_power = 0.6 /turf/open/floor/plating/whitesands initial_gas_mix = WHITESANDS_ATMOS - light_color = COLOR_VERY_LIGHT_GRAY + light_color = COLOR_SANDPLANET_LIGHT + +/turf/open/floor/plating/whitesands/lit + light_range = 2 + light_power = 0.6 diff --git a/code/modules/mapping/mapping_helpers.dm b/code/modules/mapping/mapping_helpers.dm index 52b5f7659305..458fe2f8299b 100644 --- a/code/modules/mapping/mapping_helpers.dm +++ b/code/modules/mapping/mapping_helpers.dm @@ -71,14 +71,6 @@ name = "asteroid snow baseturf editor" baseturf = /turf/open/floor/plating/asteroid/snow -/obj/effect/baseturf_helper/beach/sand - name = "beach sand baseturf editor" - baseturf = /turf/open/floor/plating/beach/sand - -/obj/effect/baseturf_helper/beach/water - name = "water baseturf editor" - baseturf = /turf/open/floor/plating/beach/water - /obj/effect/baseturf_helper/lava name = "lava baseturf editor" baseturf = /turf/open/lava/smooth diff --git a/shiptest.dme b/shiptest.dme index 5a0cb2785b17..fb866189f704 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1556,6 +1556,7 @@ #include "code\game\turfs\open\floor\plating\asteroid.dm" #include "code\game\turfs\open\floor\plating\beach.dm" #include "code\game\turfs\open\floor\plating\icemoon.dm" +#include "code\game\turfs\open\floor\plating\jungle.dm" #include "code\game\turfs\open\floor\plating\lavaland.dm" #include "code\game\turfs\open\floor\plating\misc_plating.dm" #include "code\game\turfs\open\floor\plating\planet.dm"