From d2239ca19df9bfaa8ebcd04968edc13bbc7966b9 Mon Sep 17 00:00:00 2001 From: Aylong Date: Fri, 27 Oct 2023 13:12:03 +0300 Subject: [PATCH] Fixes --- _maps/map_files220/RandomZLevels/beach.dmm | 3556 ++++++++++--------- modular_ss220/maps220/code/floors.dm | 12 +- modular_ss220/objects/code/big_bed.dm | 2 +- modular_ss220/objects/code/plastic_chair.dm | 6 +- 4 files changed, 1817 insertions(+), 1759 deletions(-) diff --git a/_maps/map_files220/RandomZLevels/beach.dmm b/_maps/map_files220/RandomZLevels/beach.dmm index 0cd8dc6da855..a05d75f4fd30 100644 --- a/_maps/map_files220/RandomZLevels/beach.dmm +++ b/_maps/map_files220/RandomZLevels/beach.dmm @@ -34,30 +34,27 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "as" = ( -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = -8 - }, -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = 5 +/obj/effect/turf_decal/siding/wood{ + dir = 10 }, -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = -14; - pixel_y = 6 +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8; + color = "black"; + pixel_y = -1; + pixel_x = 5; + initialized = 1 }, -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = -1; - pixel_y = 7 +/turf/simulated/floor/beach/away/water{ + water_overlay_image = null }, -/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "aw" = ( -/obj/structure/fluff/beach_umbrella/science, -/obj/item/reagent_containers/food/drinks/cans/cola{ - pixel_x = -10; - pixel_y = -6 +/obj/structure/chair/plastic{ + dir = 8 }, -/obj/item/reagent_containers/food/drinks/cans/space_up{ - pixel_x = 12 +/obj/item/reagent_containers/food/drinks/cans/thirteenloko{ + pixel_x = -18; + pixel_y = 8 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -104,7 +101,12 @@ }, /area/awaymission/beach) "bS" = ( -/obj/structure/fluff/beach_umbrella, +/obj/effect/turf_decal/siding/blue{ + dir = 8 + }, +/obj/structure/chair/plastic{ + dir = 8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "bZ" = ( @@ -129,11 +131,7 @@ }, /area/awaymission/beach) "ce" = ( -/obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/starkist{ - pixel_x = 20; - pixel_y = -8 - }, +/obj/effect/turf_decal/siding/dark_red, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "cg" = ( @@ -158,9 +156,13 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "cq" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/structure/flora/tree/palm{ + pixel_x = 25; + pixel_y = 22 + }, +/obj/item/stack/sheet/mineral/sandstone/fifty{ + pixel_x = 1; + pixel_y = -12 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -203,7 +205,9 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "cB" = ( -/obj/effect/turf_decal/siding/dark_red, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "cK" = ( @@ -233,9 +237,8 @@ /turf/simulated/floor/carpet, /area/awaymission/beach) "cN" = ( -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 1; - pixel_y = 0 +/obj/effect/turf_decal/siding/wood/corner{ + dir = 1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -245,11 +248,10 @@ }, /area/awaymission/beach) "cU" = ( -/obj/item/clothing/head/collectable/paper{ - desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from fire, Curators, and ocean waves."; - pixel_y = -4 +/obj/structure/mineral_door/sandstone{ + name = "Sandcastle" }, -/obj/structure/chair/plastic, +/obj/effect/turf_decal/sand/plating, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "cY" = ( @@ -290,14 +292,23 @@ /turf/simulated/wall/mineral/wood, /area/awaymission/beach) "dK" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, +/obj/item/trash/candy, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "dM" = ( -/obj/effect/baseturf_helper/beach/water, -/turf/simulated/floor/beach/away/sand_alternative, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8; + color = "black"; + pixel_y = -1; + pixel_x = 5; + initialized = 1 + }, +/turf/simulated/floor/beach/away/water{ + water_overlay_image = null + }, /area/awaymission/beach) "dO" = ( /obj/effect/turf_decal/siding/wood/corner{ @@ -305,11 +316,17 @@ }, /turf/simulated/floor/wood/fancy, /area/awaymission/beach) -"eg" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative{ +"ee" = ( +/obj/effect/turf_decal/stripes/red/line{ dir = 8 }, +/mob/living/simple_animal/crab, +/turf/simulated/floor/beach/away/sand_alternative, +/area/awaymission/beach) +"eg" = ( +/obj/effect/turf_decal/siding/wood/corner{ + dir = 4 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "ei" = ( @@ -331,7 +348,7 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "es" = ( -/obj/structure/bonfire, +/obj/structure/table/wood, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "ev" = ( @@ -389,7 +406,11 @@ /turf/simulated/floor/plating, /area/awaymission/beach) "eT" = ( -/obj/effect/turf_decal/sand, +/obj/structure/fluff/beach_umbrella/syndi, +/obj/item/reagent_containers/food/drinks/cans/cola{ + pixel_x = -6; + pixel_y = -6 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "eV" = ( @@ -437,17 +458,14 @@ /turf/simulated/floor/wood/fancy/birch, /area/awaymission/beach) "fy" = ( -/obj/structure/chair/plastic{ - dir = 8 - }, -/obj/item/reagent_containers/food/drinks/cans/thirteenloko{ - pixel_x = -18; - pixel_y = 8 - }, +/obj/structure/fluff/beach_umbrella, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "fA" = ( -/obj/machinery/kitchen_machine/grill, +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "fD" = ( @@ -529,7 +547,9 @@ /turf/simulated/floor/wood/parquet, /area/awaymission/beach) "gt" = ( -/obj/structure/fluff/beach_umbrella/cap, +/obj/effect/turf_decal/sand, +/obj/structure/bedsheetbin, +/obj/structure/table, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "gu" = ( @@ -552,10 +572,7 @@ /turf/simulated/floor/plasteel/freezer, /area/awaymission/beach) "gM" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative{ - dir = 4 - }, +/obj/effect/turf_decal/siding/wood/alternative, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "gN" = ( @@ -614,11 +631,13 @@ /turf/simulated/floor/plating, /area/awaymission/beach) "hI" = ( -/obj/item/trash/can{ - pixel_y = -9; - pixel_x = 10 +/obj/structure/bed/double, +/obj/item/bedsheet/hos/double, +/obj/item/toy/plushie/slimeplushie{ + pixel_x = 5; + pixel_y = 8 }, -/turf/simulated/floor/beach/away/sand_alternative, +/turf/simulated/floor/carpet, /area/awaymission/beach) "hJ" = ( /obj/item/reagent_containers/syringe{ @@ -632,6 +651,13 @@ icon_state = "white_large" }, /area/awaymission/beach) +"hO" = ( +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood{ + dir = 1 + }, +/turf/simulated/floor/beach/away/sand_alternative, +/area/awaymission/beach) "hS" = ( /obj/effect/decal/cleanable/dirt, /obj/machinery/gateway{ @@ -678,10 +704,8 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "if" = ( -/obj/structure/chair/plastic, -/obj/item/paicard{ - pixel_y = 4; - pixel_x = -1 +/obj/effect/turf_decal/siding/blue/corner{ + dir = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -737,14 +761,10 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "jf" = ( -/obj/structure/closet/crate/hydroponics, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/flour, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/condiment/rice, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, -/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative{ + dir = 4 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "jg" = ( @@ -776,19 +796,7 @@ /turf/simulated/floor/wood/oak, /area/awaymission/beach) "jF" = ( -/obj/structure/table/holotable, -/obj/item/reagent_containers/food/condiment/peppermill{ - pixel_y = 8; - pixel_x = -8 - }, -/obj/item/reagent_containers/food/condiment/saltshaker{ - pixel_x = 6; - pixel_y = 8 - }, -/obj/item/reagent_containers/food/drinks/cans/beer{ - pixel_y = 4; - pixel_x = -1 - }, +/obj/structure/fluff/beach_umbrella/science, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "jK" = ( @@ -810,10 +818,7 @@ /turf/simulated/floor/plasteel/freezer, /area/awaymission/beach) "jU" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood{ - dir = 8 - }, +/obj/effect/turf_decal/siding/dark_red/corner, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "kg" = ( @@ -827,8 +832,9 @@ }, /area/awaymission/beach) "ki" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 1 +/obj/item/trash/can{ + pixel_y = -5; + pixel_x = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -851,12 +857,15 @@ /turf/simulated/floor/carpet, /area/awaymission/beach) "ky" = ( -/obj/item/clothing/head/soft/green, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 1; + pixel_y = 0 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "kz" = ( -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = 11 +/obj/effect/turf_decal/siding/blue{ + dir = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -879,10 +888,6 @@ }, /area/awaymission/beach) "kZ" = ( -/obj/structure/fluff/beach_umbrella/science, -/turf/simulated/floor/beach/away/sand_alternative, -/area/awaymission/beach) -"ll" = ( /obj/structure/table/wood, /obj/item/camera{ pixel_y = 6; @@ -898,6 +903,27 @@ }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) +"le" = ( +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8; + color = "black"; + pixel_x = 5; + initialized = 1 + }, +/turf/simulated/floor/beach/away/water{ + water_overlay_image = null + }, +/area/awaymission/beach) +"ll" = ( +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative/corner{ + dir = 1 + }, +/turf/simulated/floor/beach/away/sand_alternative, +/area/awaymission/beach) "lv" = ( /obj/structure/chair{ dir = 1 @@ -907,7 +933,13 @@ }, /area/awaymission/beach) "lC" = ( -/mob/living/simple_animal/crab, +/obj/structure/chair/plastic{ + dir = 8 + }, +/obj/item/reagent_containers/food/drinks/cans/space_up{ + pixel_y = 12; + pixel_x = -8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "lF" = ( @@ -920,12 +952,9 @@ /turf/simulated/floor/wood/oak, /area/awaymission/beach) "lG" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0; - pixel_y = 24 - }, -/obj/structure/chair/plastic{ - dir = 4 +/obj/item/storage/toolbox/fluff{ + color = "cyan"; + pixel_y = -8 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -983,17 +1012,11 @@ /turf/simulated/floor/plating, /area/awaymission/beach) "mO" = ( -/obj/structure/rack, -/obj/item/cardboard_cutout{ - pixel_x = -6; - pixel_y = 5 - }, -/obj/item/cardboard_cutout{ - pixel_x = 6; - pixel_y = 5 +/obj/effect/turf_decal/siding/blue{ + dir = 4 }, -/obj/item/cardboard_cutout{ - pixel_y = 13 +/obj/structure/chair/plastic{ + dir = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1060,15 +1083,28 @@ }, /area/awaymission/beach) "nk" = ( -/obj/effect/baseturf_helper/beach/sand, -/turf/simulated/floor/beach/away/sand_alternative, -/area/awaymission/beach) -"nw" = ( -/obj/effect/turf_decal/siding/wood, -/turf/simulated/floor/beach/away/water{ - water_overlay_image = null - }, -/area/awaymission/beach) +/obj/structure/table/wood, +/obj/item/camera{ + pixel_y = 8; + pixel_x = 6 + }, +/obj/item/pen/blue{ + pixel_x = -11; + pixel_y = 2 + }, +/obj/item/id_decal/aa07{ + layer = 2.7; + pixel_y = -3; + pixel_x = -2 + }, +/turf/simulated/floor/beach/away/sand_alternative, +/area/awaymission/beach) +"nw" = ( +/obj/effect/turf_decal/siding/wood, +/turf/simulated/floor/beach/away/water{ + water_overlay_image = null + }, +/area/awaymission/beach) "nx" = ( /obj/machinery/door/airlock/medical/glass{ name = "Medbay Clinic" @@ -1179,11 +1215,11 @@ }, /area/awaymission/beach) "pm" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 4 - }, -/obj/structure/chair/plastic{ - dir = 4 +/obj/item/storage/bag/tray, +/obj/effect/turf_decal/stripes/red/box, +/obj/item/reagent_containers/food/snacks/grown/watermelon{ + pixel_y = 2; + pixel_x = 1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1198,6 +1234,11 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "pp" = ( +/obj/structure/chair/plastic, +/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ + pixel_x = 20; + pixel_y = -4 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "pA" = ( @@ -1213,8 +1254,13 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "pH" = ( -/obj/effect/turf_decal/sand, -/mob/living/simple_animal/crab, +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/item/reagent_containers/food/drinks/cans/beer{ + pixel_x = 16; + pixel_y = -16 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "pW" = ( @@ -1230,13 +1276,7 @@ }, /area/awaymission/beach) "qa" = ( -/obj/item/trash/can{ - pixel_y = -9; - pixel_x = 10 - }, -/obj/effect/turf_decal/siding/dark_red{ - dir = 4 - }, +/obj/machinery/economy/vending/cigarette/beach, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "qf" = ( @@ -1249,7 +1289,10 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "qh" = ( -/obj/machinery/economy/vending/autodrobe, +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 4; + pixel_y = 0 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "qk" = ( @@ -1285,7 +1328,10 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "qx" = ( -/obj/item/trash/candy, +/obj/item/trash/can{ + pixel_y = -9; + pixel_x = 10 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "qA" = ( @@ -1293,7 +1339,11 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "qB" = ( -/obj/effect/turf_decal/siding/dark_red/corner, +/obj/structure/fluff/beach_umbrella/science, +/obj/item/reagent_containers/food/drinks/cans/starkist{ + pixel_x = 11; + pixel_y = -2 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "qD" = ( @@ -1342,22 +1392,24 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "rC" = ( -/obj/item/trash/can{ - pixel_y = -5; - pixel_x = 4 +/obj/item/storage/toolbox/fluff{ + color = "cyan"; + pixel_x = 8 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "rE" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative{ - dir = 1 +/obj/item/stack/sheet/mineral/sandstone/fifty{ + pixel_x = -12; + pixel_y = -3 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "rI" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 4 +/obj/structure/chair/plastic, +/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind{ + pixel_x = 18; + pixel_y = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1402,13 +1454,8 @@ }, /area/awaymission/beach) "sB" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ - pixel_y = 6; - pixel_x = 6 - }, -/obj/item/reagent_containers/food/snacks/watermelonslice{ - pixel_x = -6 +/obj/effect/turf_decal/siding/blue{ + dir = 8 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1480,11 +1527,9 @@ }, /area/awaymission/beach) "up" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, -/obj/structure/chair/plastic{ - dir = 8 +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative{ + dir = 1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1495,9 +1540,7 @@ /turf/simulated/floor/plating, /area/awaymission/beach) "uD" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 8 - }, +/obj/item/clothing/head/soft/green, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "uJ" = ( @@ -1508,14 +1551,25 @@ /turf/simulated/floor/plating, /area/awaymission/beach) "va" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative{ - dir = 5 - }, -/turf/simulated/floor/beach/away/sand_alternative, +/obj/structure/closet/secure_closet/freezer/fridge/open, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/catfishmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "vq" = ( -/obj/item/toy/seashell, +/obj/structure/chair/plastic, +/obj/item/reagent_containers/food/drinks/cans/starkist{ + pixel_x = 20; + pixel_y = -8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "vw" = ( @@ -1569,7 +1623,10 @@ }, /area/awaymission/beach) "vR" = ( -/obj/effect/turf_decal/stripes/red/box, +/obj/item/reagent_containers/food/drinks/cans/tonic{ + pixel_x = -12; + pixel_y = 2 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "vS" = ( @@ -1583,7 +1640,13 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "vZ" = ( -/obj/machinery/economy/vending/cigarette/beach, +/obj/item/trash/can{ + pixel_y = -9; + pixel_x = 10 + }, +/obj/effect/turf_decal/siding/dark_red{ + dir = 4 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "wd" = ( @@ -1669,12 +1732,8 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "xg" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 9 - }, -/turf/simulated/floor/beach/away/water{ - water_overlay_image = null - }, +/obj/machinery/kitchen_machine/grill, +/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "xG" = ( /obj/structure/chair, @@ -1703,10 +1762,19 @@ }, /area/awaymission/beach) "xY" = ( -/obj/structure/chair/plastic{ - dir = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 8 + }, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8; + color = "black"; + pixel_y = -2; + pixel_x = 5; + initialized = 1 + }, +/turf/simulated/floor/beach/away/water{ + water_overlay_image = null }, -/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "yh" = ( /obj/effect/turf_decal/siding/wood{ @@ -1727,10 +1795,8 @@ /turf/simulated/floor/carpet, /area/awaymission/beach) "yB" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0; - pixel_y = 6 - }, +/obj/effect/turf_decal/sand, +/mob/living/simple_animal/crab, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "yD" = ( @@ -1738,13 +1804,10 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "yF" = ( -/obj/structure/chair/plastic{ +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative{ dir = 8 }, -/obj/item/reagent_containers/food/drinks/cans/space_up{ - pixel_y = 12; - pixel_x = -8 - }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "yI" = ( @@ -1809,10 +1872,9 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "zt" = ( -/obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime{ - pixel_y = -6; - pixel_x = 16 +/obj/structure/flora/tree/palm{ + pixel_x = 0; + pixel_y = 16 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1824,22 +1886,25 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "zU" = ( -/obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ - pixel_x = -6; - pixel_y = -6 - }, +/obj/effect/turf_decal/siding/blue/corner, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ae" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 8 +/obj/structure/table/wood, +/obj/item/melee/baseball_bat{ + pixel_y = 3; + pixel_x = 6 + }, +/obj/item/clothing/glasses/sunglasses/blindfold{ + pixel_y = 5; + pixel_x = -2 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "An" = ( -/obj/structure/chair/plastic{ - dir = 1 +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative/corner{ + dir = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1863,9 +1928,8 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "AD" = ( -/obj/item/flashlight/flare/torch{ - pixel_x = -11; - pixel_y = -6 +/obj/effect/turf_decal/siding/wood{ + dir = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1928,11 +1992,11 @@ }, /area/awaymission/beach) "Bq" = ( -/obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/cola{ - pixel_x = -6; - pixel_y = -6 +/obj/item/clothing/head/collectable/paper{ + desc = "What looks like an ordinary paper hat is actually a rare and valuable collector's edition paper hat. Keep away from fire, Curators, and ocean waves."; + pixel_y = -4 }, +/obj/structure/chair/plastic, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Br" = ( @@ -1944,9 +2008,8 @@ }, /area/awaymission/beach) "Bt" = ( -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 8; - pixel_y = 0 +/obj/vehicle/atv{ + dir = 4 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -1986,21 +2049,22 @@ /turf/simulated/floor/plating, /area/awaymission/beach) "BK" = ( -/obj/structure/table/wood, -/obj/item/melee/baseball_bat{ - pixel_y = 3; - pixel_x = 6 +/obj/structure/rack, +/obj/item/cardboard_cutout{ + pixel_x = -6; + pixel_y = 5 }, -/obj/item/clothing/glasses/sunglasses/blindfold{ - pixel_y = 5; - pixel_x = -2 +/obj/item/cardboard_cutout{ + pixel_x = 6; + pixel_y = 5 + }, +/obj/item/cardboard_cutout{ + pixel_y = 13 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "BU" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 8 - }, +/obj/item/toy/seashell, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "BV" = ( @@ -2022,10 +2086,12 @@ /area/awaymission/beach) "BW" = ( /obj/structure/flora/tree/palm{ - pixel_y = 7; - pixel_x = 9 + pixel_x = 0; + pixel_y = 24 + }, +/obj/structure/chair/plastic{ + dir = 4 }, -/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ca" = ( @@ -2035,19 +2101,22 @@ }, /area/awaymission/beach) "Cd" = ( -/obj/structure/fluff/beach_umbrella/science, -/obj/item/reagent_containers/food/drinks/cans/starkist{ - pixel_x = 11; - pixel_y = -2 +/obj/item/stack/sheet/mineral/sandstone/fifty{ + pixel_x = -14; + pixel_y = 6 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Cf" = ( -/obj/structure/flora/tree/palm{ - pixel_y = 16; - pixel_x = 12 +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/grown/watermelon{ + pixel_y = 8; + pixel_x = 5 + }, +/obj/item/reagent_containers/food/snacks/grown/watermelon{ + pixel_y = 3; + pixel_x = -3 }, -/obj/effect/overlay/coconut, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ch" = ( @@ -2089,7 +2158,9 @@ /turf/simulated/floor/wood/parquet, /area/awaymission/beach) "CC" = ( -/obj/effect/turf_decal/siding/wood/alternative, +/obj/structure/chair/plastic{ + dir = 4 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "CE" = ( @@ -2116,9 +2187,9 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "Do" = ( -/obj/item/storage/toolbox/fluff{ - color = "cyan"; - pixel_x = 8 +/obj/effect/turf_decal/siding/dark_red/corner{ + dir = 8; + pixel_y = 0 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2133,13 +2204,14 @@ }, /area/awaymission/beach) "DH" = ( -/obj/structure/closet/crate/freezer, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/meat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/structure/fluff/beach_umbrella/syndi, +/obj/item/reagent_containers/food/drinks/cans/cola{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ + pixel_x = 12 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "DJ" = ( @@ -2198,10 +2270,18 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ez" = ( -/obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ - pixel_x = 20; - pixel_y = -4 +/obj/structure/table/holotable, +/obj/item/reagent_containers/food/condiment/peppermill{ + pixel_y = 8; + pixel_x = -8 + }, +/obj/item/reagent_containers/food/condiment/saltshaker{ + pixel_x = 6; + pixel_y = 8 + }, +/obj/item/reagent_containers/food/drinks/cans/beer{ + pixel_y = 4; + pixel_x = -1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2221,11 +2301,8 @@ /turf/simulated/floor/carpet/arcade, /area/awaymission/beach) "ES" = ( -/obj/machinery/icemachine{ - dir = 4; - pixel_x = -1; - pixel_y = -3 - }, +/obj/machinery/economy/vending/snack, +/obj/effect/turf_decal/sand, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "ET" = ( @@ -2236,16 +2313,13 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "EX" = ( -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = -12; - pixel_y = -3 +/obj/effect/turf_decal/siding/wood{ + dir = 1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "EY" = ( -/obj/structure/flora/tree/palm{ - pixel_y = 18 - }, +/obj/structure/bonfire, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Fb" = ( @@ -2278,27 +2352,13 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "FK" = ( -/obj/structure/rack, -/obj/effect/turf_decal/sand, -/obj/item/clothing/shoes/sandal{ - pixel_y = 4; - pixel_x = 8 - }, -/obj/item/clothing/shoes/sandal{ - pixel_x = 4 - }, -/obj/item/clothing/shoes/sandal{ - pixel_y = -4 - }, -/obj/item/clothing/shoes/sandal{ - pixel_y = -7; - pixel_x = -3 - }, +/obj/machinery/economy/vending/autodrobe, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "FQ" = ( -/obj/effect/turf_decal/sand, -/obj/machinery/economy/vending/clothing, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 1 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "FX" = ( @@ -2322,11 +2382,7 @@ /turf/simulated/floor/carpet, /area/awaymission/beach) "Ge" = ( -/obj/effect/turf_decal/sand/plating, -/obj/item/reagent_containers/glass/bucket/wooden{ - pixel_y = 8; - pixel_x = -6 - }, +/obj/structure/fluff/beach_umbrella/engine, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Gf" = ( @@ -2442,19 +2498,16 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "He" = ( -/obj/effect/turf_decal/siding/dark_red/corner{ - dir = 4; - pixel_y = 0 - }, +/obj/effect/baseturf_helper/beach/sand, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Hg" = ( -/obj/machinery/door_control/normal/south{ - id = "BeachGarage" - }, -/turf/simulated/floor/plasteel/dark{ - icon_state = "dark_herringbone" +/obj/structure/chair/plastic, +/obj/item/reagent_containers/food/drinks/cans/lemon_lime{ + pixel_y = -6; + pixel_x = 16 }, +/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Hm" = ( /obj/effect/decal/cleanable/dirt, @@ -2473,11 +2526,8 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "Ht" = ( -/obj/structure/table/wood, -/obj/item/camera{ - pixel_y = 8; - pixel_x = -3 - }, +/obj/structure/billboard/space_cola, +/obj/effect/turf_decal/siding/dark_red, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Hv" = ( @@ -2485,8 +2535,9 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Hy" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 5 +/obj/item/flashlight/flare/torch{ + pixel_x = -11; + pixel_y = -6 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2501,7 +2552,9 @@ /turf/simulated/floor/wood/parquet, /area/awaymission/beach) "HP" = ( -/obj/structure/fluff/beach_umbrella/engine, +/obj/effect/turf_decal/siding/blue/corner{ + dir = 8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "HS" = ( @@ -2509,8 +2562,9 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "HT" = ( -/obj/item/reagent_containers/food/drinks/cans/starkist{ - pixel_x = -6 +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative{ + dir = 9 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2604,8 +2658,8 @@ /turf/simulated/floor/carpet/arcade, /area/awaymission/beach) "IV" = ( -/obj/effect/turf_decal/siding/blue/corner{ - dir = 1 +/obj/effect/turf_decal/siding/dark_red{ + dir = 8 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2649,8 +2703,12 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "JC" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 +/obj/structure/chair/plastic{ + dir = 4 + }, +/obj/item/reagent_containers/food/drinks/cans/lemon_lime{ + pixel_x = 14; + pixel_y = -12 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2660,12 +2718,18 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "JK" = ( -/obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/space_mountain_wind{ - pixel_x = 18; - pixel_y = 4 +/obj/effect/turf_decal/siding/wood{ + dir = 9 + }, +/obj/effect/turf_decal/tile/neutral/half{ + dir = 8; + color = "black"; + pixel_x = 5; + initialized = 1 + }, +/turf/simulated/floor/beach/away/water{ + water_overlay_image = null }, -/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "JO" = ( /obj/structure/bed{ @@ -2740,10 +2804,10 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "KB" = ( -/obj/structure/chair/plastic, -/obj/item/reagent_containers/food/drinks/cans/cola{ - pixel_x = 18; - pixel_y = -3 +/obj/structure/fluff/beach_umbrella/syndi, +/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ + pixel_x = -6; + pixel_y = -6 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2812,10 +2876,7 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "Lv" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative{ - dir = 9 - }, +/obj/effect/turf_decal/stripes/red/box, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "LD" = ( @@ -2826,28 +2887,19 @@ /area/awaymission/beach) "LG" = ( /obj/structure/flora/tree/palm{ - pixel_x = 0; - pixel_y = 22 - }, -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = -6; - pixel_y = -8 - }, -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = 8; - pixel_y = -8 - }, -/obj/item/stack/sheet/mineral/sandstone/fifty{ - pixel_x = 1; - pixel_y = -2 + pixel_y = 18 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "LI" = ( -/obj/structure/mineral_door/sandstone{ - name = "Sandcastle" - }, -/obj/effect/turf_decal/sand/plating, +/obj/structure/closet/crate/hydroponics, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "LM" = ( @@ -2857,12 +2909,10 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "LN" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/item/reagent_containers/food/drinks/cans/lemon_lime{ - pixel_x = 14; - pixel_y = -12 +/obj/structure/table/wood, +/obj/item/camera{ + pixel_y = 8; + pixel_x = -3 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2910,8 +2960,14 @@ }, /area/awaymission/beach) "Ms" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 4 +/obj/structure/table/wood, +/obj/item/camera{ + pixel_y = 12; + pixel_x = 6 + }, +/obj/item/camera_film{ + pixel_y = 4; + pixel_x = -2 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2950,7 +3006,11 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "MN" = ( -/obj/structure/table/wood, +/obj/machinery/icemachine{ + dir = 4; + pixel_x = -1; + pixel_y = -3 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "MT" = ( @@ -2971,9 +3031,10 @@ }, /area/awaymission/beach) "Ne" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative/corner{ - dir = 4 +/obj/structure/fluff/beach_umbrella/syndi, +/obj/item/reagent_containers/food/drinks/cans/space_up{ + pixel_x = 11; + pixel_y = -2 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -2995,12 +3056,9 @@ /turf/simulated/floor/carpet/arcade, /area/awaymission/beach) "Nt" = ( -/obj/structure/chair/plastic{ - dir = 4 - }, -/obj/item/reagent_containers/food/drinks/cans/beer{ - pixel_x = 16; - pixel_y = -16 +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_y = -2; + pixel_x = -12 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3054,8 +3112,10 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "On" = ( -/obj/effect/turf_decal/siding/wood/corner{ - dir = 4 +/obj/structure/chair/plastic, +/obj/item/paicard{ + pixel_y = 4; + pixel_x = -1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3131,10 +3191,7 @@ /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "PV" = ( -/obj/effect/turf_decal/stripes/red/line{ - dir = 8 - }, -/mob/living/simple_animal/crab, +/obj/effect/baseturf_helper/beach/water, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "PW" = ( @@ -3164,25 +3221,21 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "QH" = ( -/obj/vehicle/atv{ - dir = 4 +/obj/structure/fluff/beach_umbrella/science, +/obj/item/reagent_containers/food/drinks/cans/cola{ + pixel_x = -10; + pixel_y = -6 + }, +/obj/item/reagent_containers/food/drinks/cans/space_up{ + pixel_x = 12 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "QJ" = ( -/obj/structure/table/wood, -/obj/item/camera{ - pixel_y = 8; - pixel_x = 6 - }, -/obj/item/pen/blue{ - pixel_x = -11; - pixel_y = 2 - }, -/obj/item/id_decal/aa07{ - layer = 2.7; - pixel_y = -3; - pixel_x = -2 +/obj/structure/chair/plastic, +/obj/item/reagent_containers/food/drinks/cans/cola{ + pixel_x = 18; + pixel_y = -3 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3233,7 +3286,11 @@ /turf/simulated/floor/wood/fancy/birch, /area/awaymission/beach) "Ri" = ( -/obj/effect/turf_decal/siding/blue/corner, +/obj/effect/turf_decal/sand/plating, +/obj/item/reagent_containers/glass/bucket/wooden{ + pixel_y = 8; + pixel_x = -6 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Rj" = ( @@ -3255,8 +3312,9 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "RC" = ( -/obj/effect/turf_decal/siding/wood{ - dir = 1 +/obj/structure/flora/tree/palm{ + pixel_x = 0; + pixel_y = 6 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3290,10 +3348,7 @@ }, /area/awaymission/beach) "Sa" = ( -/obj/item/reagent_containers/food/drinks/cans/tonic{ - pixel_x = -12; - pixel_y = 2 - }, +/mob/living/simple_animal/crab, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Sg" = ( @@ -3345,14 +3400,9 @@ }, /area/awaymission/beach) "SS" = ( -/obj/structure/table/wood, -/obj/item/camera{ - pixel_y = 12; - pixel_x = 6 - }, -/obj/item/camera_film{ - pixel_y = 4; - pixel_x = -2 +/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/siding/wood/alternative{ + dir = 5 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3404,16 +3454,12 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "Uk" = ( -/obj/item/reagent_containers/glass/bucket/wooden{ - pixel_y = -2; - pixel_x = -12 - }, +/obj/structure/fluff/beach_umbrella/cap, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Un" = ( -/obj/effect/turf_decal/sand, -/obj/effect/turf_decal/siding/wood/alternative/corner{ - dir = 1 +/obj/effect/turf_decal/siding/wood{ + dir = 5 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3425,20 +3471,10 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "Us" = ( -/obj/structure/closet/secure_closet/freezer/fridge/open{ - initialized = 1 +/obj/item/reagent_containers/food/drinks/cans/starkist{ + pixel_x = -6 }, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/catfishmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/obj/item/reagent_containers/food/snacks/salmonmeat, -/turf/simulated/floor/wood/fancy/cherry, +/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ut" = ( /obj/item/circular_saw{ @@ -3451,11 +3487,12 @@ /turf/simulated/floor/wood/fancy/birch, /area/awaymission/beach) "Uu" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0; - pixel_y = 16 +/obj/machinery/door_control/shutter/south{ + id = "BeachGarage" + }, +/turf/simulated/floor/plasteel/dark{ + icon_state = "dark_herringbone" }, -/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "UB" = ( /obj/structure/flora/tree/palm{ @@ -3497,10 +3534,13 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "Ve" = ( -/obj/effect/turf_decal/siding/dark_red{ - dir = 8 +/obj/effect/turf_decal/siding/wood/alternative{ + dir = 1 }, -/turf/simulated/floor/beach/away/sand_alternative, +/obj/machinery/door_control/shutter/south{ + id = "BeachBoats" + }, +/turf/simulated/floor/wood/parquet, /area/awaymission/beach) "Vg" = ( /obj/structure/table/wood, @@ -3697,13 +3737,12 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "WW" = ( -/obj/effect/turf_decal/siding/wood/alternative{ - dir = 1 - }, -/obj/machinery/door_control/normal/south{ - id = "BeachBoats" +/obj/structure/flora/tree/palm{ + pixel_y = 16; + pixel_x = 12 }, -/turf/simulated/floor/wood/parquet, +/obj/effect/overlay/coconut, +/turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "WX" = ( /obj/machinery/door_control/bolt_control/north{ @@ -3712,11 +3751,11 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "Xh" = ( -/obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/space_up{ - pixel_x = 11; - pixel_y = -2 +/obj/structure/flora/tree/palm{ + pixel_y = 7; + pixel_x = 9 }, +/obj/effect/turf_decal/siding/wood, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Xj" = ( @@ -3735,13 +3774,12 @@ /turf/simulated/floor/wood, /area/awaymission/beach) "Xr" = ( -/obj/structure/billboard/space_cola, -/obj/effect/turf_decal/siding/dark_red, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Xv" = ( -/obj/machinery/economy/vending/snack, -/obj/effect/turf_decal/sand, +/obj/effect/turf_decal/stripes/red/line{ + dir = 8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "XH" = ( @@ -3749,14 +3787,9 @@ /turf/simulated/floor/wood/fancy/cherry, /area/awaymission/beach) "XJ" = ( -/obj/structure/table/wood, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ - pixel_y = 8; - pixel_x = 5 - }, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ - pixel_y = 3; - pixel_x = -3 +/obj/structure/flora/tree/palm{ + pixel_x = 0; + pixel_y = 24 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3769,9 +3802,9 @@ }, /area/awaymission/beach) "XT" = ( -/obj/effect/turf_decal/sand, -/obj/structure/bedsheetbin, -/obj/structure/table, +/obj/effect/turf_decal/siding/wood/corner{ + dir = 8 + }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "XU" = ( @@ -3782,30 +3815,22 @@ /turf/simulated/floor/wood/fancy, /area/awaymission/beach) "XW" = ( -/obj/item/storage/bag/tray, -/obj/effect/turf_decal/stripes/red/box, -/obj/item/reagent_containers/food/snacks/grown/watermelon{ - pixel_y = 2; - pixel_x = 1 - }, +/obj/structure/closet/crate/freezer, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, +/obj/item/reagent_containers/food/snacks/salmonmeat, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ya" = ( -/obj/item/storage/toolbox/fluff{ - color = "cyan"; - pixel_y = -8 - }, +/obj/effect/turf_decal/sand, +/obj/machinery/economy/vending/clothing, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ym" = ( -/obj/structure/fluff/beach_umbrella/syndi, -/obj/item/reagent_containers/food/drinks/cans/cola{ - pixel_x = -10; - pixel_y = -6 - }, -/obj/item/reagent_containers/food/drinks/cans/dr_gibb{ - pixel_x = 12 - }, +/obj/effect/turf_decal/sand, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) "Ys" = ( @@ -3824,8 +3849,27 @@ /turf/simulated/floor/carpet/green, /area/awaymission/beach) "YQ" = ( -/obj/effect/turf_decal/siding/blue{ - dir = 4 +/obj/structure/rack, +/obj/effect/turf_decal/sand, +/obj/item/clothing/shoes/sandal{ + pixel_y = 4; + pixel_x = 8 + }, +/obj/item/clothing/shoes/sandal{ + pixel_x = 4 + }, +/obj/item/clothing/shoes/sandal{ + pixel_y = -4 + }, +/obj/item/clothing/shoes/sandal{ + pixel_y = -7; + pixel_x = -3 + }, +/turf/simulated/floor/beach/away/sand_alternative, +/area/awaymission/beach) +"YV" = ( +/obj/structure/chair/plastic{ + dir = 1 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -3849,9 +3893,13 @@ /turf/simulated/floor/carpet/arcade, /area/awaymission/beach) "Ze" = ( -/obj/structure/flora/tree/palm{ - pixel_x = 0; - pixel_y = 24 +/obj/structure/table/wood, +/obj/item/reagent_containers/food/snacks/grown/watermelon{ + pixel_y = 6; + pixel_x = 6 + }, +/obj/item/reagent_containers/food/snacks/watermelonslice{ + pixel_x = -6 }, /turf/simulated/floor/beach/away/sand_alternative, /area/awaymission/beach) @@ -9879,9 +9927,9 @@ ev DZ cP yY -vq -pp -vq +BU +Xr +BU NU sj MW @@ -10015,11 +10063,11 @@ BE Av DZ yY -vq -ky -pp -Ya -pp +BU +uD +Xr +lG +Xr NU sj MW @@ -10151,13 +10199,13 @@ DZ DZ DZ DZ -yB -pp +RC +Xr +aw fy -bS -yF -pp -pp +lC +Xr +Xr hX MW MW @@ -10277,7 +10325,7 @@ Ys hk Ys DZ -pp +Xr DZ Ys Ys @@ -10287,13 +10335,13 @@ hk Ys Ys TW -cq -eT -pp -pp -pp -pp -pp +hO +Ym +Xr +Xr +Xr +Xr +Xr Hv hX MW @@ -10425,13 +10473,13 @@ DZ DZ DZ DZ -pp -pp -pp -pp -pp -yB -pp +Xr +Xr +Xr +Xr +Xr +RC +Xr NU sj MW @@ -10562,14 +10610,14 @@ gN Ih Xq DZ -pp -pp +Xr +Xr DZ xJ DZ DZ DZ -yB +RC NU Pn Pn @@ -10699,7 +10747,7 @@ mQ Ih ev DZ -yB +RC DZ DZ Ys @@ -10707,10 +10755,10 @@ ic Ys DZ DZ -yB -pp -pp -pp +RC +Xr +Xr +Xr NU Pn sj @@ -10827,7 +10875,7 @@ Qo Av DZ Sl -BE +hI uc DZ wP @@ -10845,11 +10893,11 @@ Ol Rk DZ DZ -yB -pp -pp -pp -pp +RC +Xr +Xr +Xr +Xr NU Pn Pn @@ -10982,16 +11030,16 @@ Iy Ys mi eG -pp -vq -pp -pp +Xr +BU +Xr +Xr jM -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr NU Pn sj @@ -11119,29 +11167,29 @@ Ys Ys mi eG -pp -pp -pp -zU +Xr +Xr +Xr +KB Wb -pp -pp -pp +Xr +Xr +Xr Hv -pp -pp -pp +Xr +Xr +Xr NU sj MW MW MW dF -pp -yB -pp -pp -pp +Xr +RC +Xr +Xr +Xr NU sj MW @@ -11256,30 +11304,30 @@ Ys ms eG eG -eT -pp -pp -pp -pp -pp -pp +Ym +Xr +Xr +Xr +Xr +Xr +Xr qp -pp -pp -yB -pp -vq +Xr +Xr +RC +Xr +BU NU Pn Pn Pn yY -pp -pp -pp -pp -pp -vq +Xr +Xr +Xr +Xr +Xr +BU NU sj MW @@ -11392,31 +11440,31 @@ Ys Ys eG eG -eT -eT -pp -pp -pp -pp -pp -kZ +Ym +Ym +Xr +Xr +Xr +Xr +Xr +jF Ss -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -lC -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Sa +Xr Jh hX MW @@ -11528,33 +11576,33 @@ Ys Ys Ys DZ +RC +Ym yB -eT -pH -eT -pp -pp -pp +Ym +Xr +Xr +Xr Hv -pp -pp -pp -pp +Xr +Xr +Xr +Xr DZ eG eG DZ -pp +Xr DZ eG eG DZ -yB -pp -pp -gt -pp -pp +RC +Xr +Xr +Uk +Xr +Xr NU sj MW @@ -11666,16 +11714,16 @@ FZ FZ Kb FZ -eT -eT -eT -pp -pp -yB -pp -pp -pp -pp +Ym +Ym +Ym +Xr +Xr +RC +Xr +Xr +Xr +Xr DZ DZ Gf @@ -11688,11 +11736,11 @@ WF DZ DZ Hv -pp +Xr qp qp -pp -pp +Xr +Xr hX MW MW @@ -11804,15 +11852,15 @@ dG DZ FZ FZ -eT -eT -pp -pp -pp -pp -pp -pp -pp +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Xr +Xr DZ Sk Gp @@ -11824,11 +11872,11 @@ hW oP co DZ -pp -pp -pp -yB -pp +Xr +Xr +Xr +RC +Xr SE bF MW @@ -11942,18 +11990,18 @@ Kb FZ FZ FZ -eT -pp -pp -pp -pp -pp -pp -pp -DZ -DZ -ab -Zd +Ym +Xr +Xr +Xr +Xr +Xr +Xr +Xr +DZ +DZ +ab +Zd Gp EQ Nr @@ -11961,11 +12009,11 @@ nM Hq Ys eG -pp -pp -pp +Xr +Xr +Xr Hv -pp +Xr hX MW MW @@ -12076,18 +12124,18 @@ Ys Ys DZ DZ -yB +RC FZ FZ FZ -pp -pp -pp -pp -pp -pp -vq -pp +Xr +Xr +Xr +Xr +Xr +Xr +BU +Xr DZ eG DZ @@ -12098,11 +12146,11 @@ Ys oQ Ys DZ -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr hX MW MW @@ -12212,21 +12260,21 @@ vw Op Ys eG -yB -FK -eT +RC +YQ +Ym FZ FZ FZ -pp -pp -pp +Xr +Xr +Xr Hv -pp -pp -yB -pp -eT +Xr +Xr +RC +Xr +Ym DZ eG eG @@ -12235,11 +12283,11 @@ Ys Vg DZ DZ -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr NU sj MW @@ -12350,34 +12398,34 @@ DR Ys eG eG -FK -eT -eT +YQ +Ym +Ym FZ FZ FZ -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -eT +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Ym DZ Ks eG DZ -pp -eT -pp -pp -pp -pp -pp +Xr +Ym +Xr +Xr +Xr +Xr +Xr hX MW MW @@ -12487,34 +12535,34 @@ dO Ys mi eG -FK -eT -eT -pp +YQ +Ym +Ym +Xr FZ FZ FZ -pp -pp -pp -pp -pp -pp -pp -eT -pp -pp -Ae -jU -dK -ki -pp -pp -pp -eT -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Ym +Xr +Xr +XT +fA +cB +cN +Xr +Xr +Xr +Ym +Xr +Xr +Xr hX MW MW @@ -12603,11 +12651,11 @@ nj lv Oc MW -eA +as Tq nZ QQ -xg +JK Br MW MW @@ -12624,34 +12672,34 @@ Ys Ys lS eG -XT -eT +gt +Ym Hv -pp -pp +Xr +Xr FZ FZ FZ -pp -pp -pp +Xr +Xr +Xr Hv -pp -eT -eT -eT -pp -eT -pp -eT -pp -eT -vq -pp -pp -pp -pp -pp +Xr +Ym +Ym +Ym +Xr +Ym +Xr +Ym +Xr +Ym +BU +Xr +Xr +Xr +Xr +Xr hX MW MW @@ -12741,9 +12789,9 @@ DZ DZ MW AG -mT -mT -mT +xY +dM +le Br MW MW @@ -12761,34 +12809,34 @@ Vv Dl DZ DZ -eT -pp -pp -pp -pp -pp +Ym +Xr +Xr +Xr +Xr +Xr FZ FZ FZ -pp -pp -pp -eT -eT -eT -pp -eT -pp -eT -eT -pp -pp -pp -eT -pp -pp -zt -pp +Xr +Xr +Xr +Ym +Ym +Ym +Xr +Ym +Xr +Ym +Ym +Xr +Xr +Xr +Ym +Xr +Xr +Hg +Xr hX MW MW @@ -12897,35 +12945,35 @@ DZ DZ DZ DZ -pp -pp -pp -pp -vq -pp -pp -pp +Xr +Xr +Xr +Xr +BU +Xr +Xr +Xr FZ FZ -eT -eT -eT -eT -eT -pp -pp -eT -eT -pp -pp -eT -pp -pp -pp -pp -pp -bS -pp +Ym +Ym +Ym +Ym +Ym +Xr +Xr +Ym +Ym +Xr +Xr +Ym +Xr +Xr +Xr +Xr +Xr +fy +Xr hX MW MW @@ -13032,37 +13080,37 @@ DZ DZ DZ Hv -pp -pp -pp -pp -pp -pp -pp -pp -yB -pp -eT -eT -eT -eT -eT -eT -pp -qx +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +RC +Xr +Ym +Ym +Ym +Ym +Ym +Ym +Xr +dK DZ DZ eG eG DZ DZ -Xv -pp -eT -pp -pp +ES +Xr +Ym +Xr +Xr Dg -pp +Xr hX MW MW @@ -13166,27 +13214,27 @@ mP Iz DZ DZ -LG -pp -pp -pp +cq +Xr +Xr +Xr OS OS OS -pp -pp -pp -pp -pp -pp -eT -eT -eT -pp -pp -eT -eT -jf +Xr +Xr +Xr +Xr +Xr +Xr +Ym +Ym +Ym +Xr +Xr +Ym +Ym +LI DZ by Ia @@ -13194,12 +13242,12 @@ iq rS DZ kp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr hX MW MW @@ -13304,25 +13352,25 @@ DZ DZ hu eV -pp -kz +Xr +Xr OS OS aV OS OS -vq -pp -pp -pp -pp -eT -eT -yB -pp -pp -pp -eT +BU +Xr +Xr +Xr +Xr +Ym +Ym +RC +Xr +Xr +Xr +Ym DZ DZ NM @@ -13332,10 +13380,10 @@ hv cA wH gu -pp -pp -ce -pp +Xr +Xr +vq +Xr SE bF MW @@ -13442,24 +13490,24 @@ MW MW sc eV -as +Cd OS aV EG aV OS -vq -pp +BU +Xr Jf Yv VC -eT -eT -pp -pp -pp -pp -eT +Ym +Ym +Xr +Xr +Xr +Xr +Ym WR hv hv @@ -13469,10 +13517,10 @@ hv WS Jq VJ -pp -pp -gt -pp +Xr +Xr +Uk +Xr hX MW MW @@ -13579,23 +13627,23 @@ MW MW MW dF -EX +rE OS aV aV aV -LI -pp -pp +cU +Xr +Xr DZ DZ DZ -eT -eT +Ym +Ym Hv -pp -pp -pp +Xr +Xr +Xr UB DZ hv @@ -13606,10 +13654,10 @@ hv WS Jq VJ -pp -pp -KB -pp +Xr +Xr +QJ +Xr hX MW MW @@ -13716,23 +13764,23 @@ MW MW MW dF -Uk +Nt OS -Ge +Ri aV aV OS -vq -pp +BU +Xr DZ aK wr -eT -eT -pp -pp -pp -pp +Ym +Ym +Xr +Xr +Xr +Xr DZ DZ Ub @@ -13743,10 +13791,10 @@ hv qs Jq VJ -pp -pp -pp -pp +Xr +Xr +Xr +Xr NU sj MW @@ -13853,23 +13901,23 @@ MW MW MW dF -pp +Xr OS OS aV OS OS -vq -pp +BU +Xr DZ DZ DZ -eT -eT -pp -pp -pp -vq +Ym +Ym +Xr +Xr +Xr +BU DZ HS hv @@ -13880,11 +13928,11 @@ LQ SX Au Rn +Xr +Xr +Xr pp -pp -pp -Ez -pp +Xr hX MW MW @@ -13990,23 +14038,23 @@ MW MW MW dF -pp -pp +Xr +Xr OS OS OS -pp -pp -pp +Xr +Xr +Xr DZ hr Ko -eT -eT -pp -pp -pp -pp +Ym +Ym +Xr +Xr +Xr +Xr eG eE hv @@ -14016,12 +14064,12 @@ hv fc DZ Rn -pp -pp -pp -yB -HP -pp +Xr +Xr +Xr +RC +Ge +Xr hX MW MW @@ -14127,23 +14175,23 @@ MW MW MW dF -pp -vq -pp -pp -pp -yB -pp +Xr +BU +Xr +Xr +Xr +RC +Xr DZ DZ DZ DZ -eT -eT -pp -pp -pp -pp +Ym +Ym +Xr +Xr +Xr +Xr eG qf hv @@ -14152,13 +14200,13 @@ hv WD WS VJ -pp -pp -pp -vq -pp -JK -pp +Xr +Xr +Xr +BU +Xr +rI +Xr hX MW MW @@ -14264,23 +14312,23 @@ MW MW MW dF -pp -pp +Xr +Xr Hv -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr DZ IH Ng -eT -eT -pp -yB -pp -pp +Ym +Ym +Xr +RC +Xr +Xr eG lP hv @@ -14289,13 +14337,13 @@ gh ZS jg Rn -pp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr hX MW MW @@ -14403,35 +14451,35 @@ MW sc eV TU -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr DZ DZ DZ -eT -eT -pp -pp +Ym +Ym +Xr +Xr Hv -pp +Xr DZ Mt hv -Us +va OA jg Rn -pp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr SE bF MW @@ -14539,43 +14587,43 @@ MW MW MW dF -pp -pp -pp -dM -pp -pp -pp +Xr +Xr +Xr +PV +Xr +Xr +Xr DZ -vZ -eT -eT -eT -pp -pp -pp -pp +qa +Ym +Ym +Ym +Xr +Xr +Xr +Xr DZ DZ eG eG DZ yh -pp -pp -pp -pp -pp -jF -pp -pp -hX -MW -MW -MW -MW -MW -MW +Xr +Xr +Xr +Xr +Xr +Ez +Xr +Xr +hX +MW +MW +MW +MW +MW +MW MW MW MW @@ -14676,35 +14724,35 @@ MW MW MW dF -pp -pp -pp -nk -pp -pp -yB -pp -pp -eT -eT -pp -pp -pp -pp -pp -yB -pp -pp -rC -pp +Xr +Xr +Xr +He +Xr +Xr +RC +Xr +Xr +Ym +Ym +Xr +Xr +Xr +Xr +Xr +RC +Xr +Xr +ki +Xr Hv -pp -pp -pp -pp -pp -fA -pp +Xr +Xr +Xr +Xr +Xr +xg +Xr SE bF MW @@ -14813,35 +14861,35 @@ MW MW MW dF -Nt -pp -pp -yB -pp -pp -pp -pp -pp -eT -eT -pp -pp -pp -pp -yB -pp -yB -pp -yB -pp -pp -pp -pp -pp -pp -pp -DH -pp +pH +Xr +Xr +RC +Xr +Xr +Xr +Xr +Xr +Ym +Ym +Xr +Xr +Xr +Xr +RC +Xr +RC +Xr +RC +Xr +Xr +Xr +Xr +Xr +Xr +Xr +XW +Xr hX MW MW @@ -14950,35 +14998,35 @@ MW MW MW dF -Ze -pp -pp -pp +XJ +Xr +Xr +Xr Hv -pp -pp -pp -pp -eT -eT -pp -pp -pp -pp -pp -pp -vq -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Xr +BU +Xr +Xr +Xr +Xr +Xr IC bZ Gk -pp -pp -pp +Xr +Xr +Xr hX MW MW @@ -15088,34 +15136,34 @@ MW MW sc eV -pp -pp -pp -pp -pp -pp -pp -pp -eT -eT -eT -qB +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Ym +Ym +Ym +jU ej -qa -He -pp -pp +vZ +qh +Xr +Xr Hv -pp -pp -pp -pp +Xr +Xr +Xr +Xr jB lF DJ -pp -pp -pp +Xr +Xr +Xr NU sj MW @@ -15225,35 +15273,35 @@ MW MW MW dF -lG -pp -pp -pp -pp -pp -pp -pp -yB -eT -eT +BW +Xr Xr +Xr +Xr +Xr +Xr +Xr +RC +Ym +Ym +Ht Kh oE Pr -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr TU -pp -pp +Xr +Xr hX MW MW @@ -15362,35 +15410,35 @@ MW MW MW dF -pp -pp -LN -pp -Xh -pp -pp -pp -pp -eT -eT -cB +Xr +Xr +JC +Xr +Ne +Xr +Xr +Xr +Xr +Ym +Ym +ce ew oE Pr -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr Hv -pp +Xr hX MW MW @@ -15501,33 +15549,33 @@ MW sc hu Wq -pp -pp +Xr +Xr qp qp -pp -pp -pp -eT -eT -cB +Xr +Xr +Xr +Ym +Ym +ce nb oE Pr -pp +Xr Hv -pp -pp -yB -pp -pp +Xr +Xr +RC +Xr +Xr TU -pp -pp -lC -pp -pp -Do +Xr +Xr +Sa +Xr +Xr +rC NU sj MW @@ -15640,32 +15688,32 @@ MW sc hu eV -pp -pp -pp -pp -pp -eT -eT -Bt -Ve -Ve -cN -pp -pp -pp -pp -pp -pp -xY -xY -xY -xY -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Ym +Ym +Do +IV +IV +ky +Xr +Xr +Xr +Xr +Xr +Xr +CC +CC +CC +CC +Xr +Xr +Xr eW -pp +Xr hX MW MW @@ -15757,52 +15805,52 @@ qR qR qR qR -qR -qR -qR -qR -qR -qR -fW -MW -MW -MW -MW -MW -MW -MW -MW -MW -MW -MW -MW -dF -pp -Cd -pp -pp -eT -eT -eT -yB -pp -pp -pp -pp -hI -pp -pp -pp -Ri -pm -pm -pm -pm -YQ -rI -pp -aw -pp +qR +qR +qR +qR +qR +qR +fW +MW +MW +MW +MW +MW +MW +MW +MW +MW +MW +MW +MW +dF +Xr +qB +Xr +Xr +Ym +Ym +Ym +RC +Xr +Xr +Xr +Xr +qx +Xr +Xr +Xr +zU +mO +mO +mO +mO +kz +if +Xr +QH +Xr hX MW MW @@ -15914,32 +15962,32 @@ MW MW MW dF -pp +Xr YB YB -pp -eT -eT -pp -pp -pp -pp -pp -pp -pp -vq -if +Xr +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Xr +Xr +BU +On eW aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -pp +Xr eW -vq +BU hX MW MW @@ -16052,30 +16100,30 @@ MW MW sc eV -pp -pp -pp -eT -eT -pp -pp -pp -pp -pp -pp -Cf -pp +Xr +Xr +Xr +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Xr +WW +Xr eW eW aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -pp -pp +Xr +Xr SE bF MW @@ -16189,27 +16237,27 @@ MW MW MW dF -pp -pp -pp -eT -eT -yB -pp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Ym +Ym +RC +Xr +Xr +Xr +Xr +Xr +Xr +Xr eW eW aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ TU SE @@ -16327,28 +16375,28 @@ MW MW dF Hv -pp -pp -eT -eT -pp -pp -pp -pp +Xr +Xr +Ym +Ym +Xr +Xr +Xr +Xr Hv -pp -eT -pp -pp -pp +Xr +Ym +Xr +Xr +Xr aL -pp +Xr Jh -pp -pp -pp +Xr +Xr +Xr qJ -pp +Xr hX MW MW @@ -16463,29 +16511,29 @@ MW MW MW dF -pp -pp -pp -eT -eT -eT -eT -eT -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Ym +Ym +Ym +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Xr xG aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -lC +Sa hX MW MW @@ -16600,21 +16648,21 @@ MW MW MW dF -yB -pp -pp -eT -eT -eT -pp -eT -eT -pp -eT -pp -pp -pp +RC +Xr +Xr +Ym Ym +Ym +Xr +Ym +Ym +Xr +Ym +Xr +Xr +Xr +DH aL Ew Ew @@ -16622,7 +16670,7 @@ Ew Ew Ew qJ -pp +Xr hX MW MW @@ -16737,29 +16785,29 @@ MW MW cP yY -pp -pp +Xr +Xr Hv -eT -eT -pp -MN -pp -pp -pp -pp -pp -pp -pp +Ym +Ym +Xr +es +Xr +Xr +Xr +Xr +Xr +Xr +Xr xG aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -pp +Xr hX MW MW @@ -16873,30 +16921,30 @@ MW MW cP yY -pp -pp -ES -pp -eT -eT -pp -pp -pp -pp -eT -pp -pp +Xr +Xr +MN +Xr +Ym +Ym +Xr +Xr +Xr +Xr +Ym +Xr +Xr PE -pp -pp +Xr +Xr aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -pp +Xr hX MW MW @@ -17009,29 +17057,29 @@ MW cP Pn yY -pp -pp -pp -pp -pp -eT -eT -eT -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Ym +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Xr Hv eW eW aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ Hv hX @@ -17144,33 +17192,33 @@ MW MW cP yY -yB -pp -mO +RC +Xr +BK DZ DZ DZ DZ -FQ -eT -eT -pp -pp -pp -pp -pp -eT -pp +Ya +Ym +Ym +Xr +Xr +Xr +Xr +Xr +Ym +Xr eW eW aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -vq +BU NU sj MW @@ -17280,8 +17328,8 @@ MW MW MW dF -pp -lC +Xr +Sa DZ DZ DZ @@ -17289,26 +17337,26 @@ iE iE DZ DZ -gM -Ne -pp -pp -Ht -SS -pp -pp -pp +jf +An +Xr +Xr +LN +Ms +Xr +Xr +Xr eW eW aL -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr qJ -pp -pp +Xr +Xr NU sj MW @@ -17417,7 +17465,7 @@ MW MW cP yY -pp +Xr DZ DZ iE @@ -17427,26 +17475,26 @@ Ir Ir PW Ir -va -Ne -pp -ll -QJ -pp -pp -pp -pp -pp -uD -up -up -up -up +SS +An +Xr +kZ +nk +Xr +Xr +Xr +Xr +Xr +HP +bS +bS +bS +bS +sB +FQ +Xr +Bq BU -IV -pp -cU -vq hX MW MW @@ -17553,8 +17601,8 @@ MW MW cP yY -pp -pp +Xr +Xr DZ iE Ir @@ -17565,25 +17613,25 @@ Ir PW Ir Ir -rE -pp -pp -pp +up +Xr +Xr +Xr Hv -pp -pp -pp -pp +Xr +Xr +Xr +Xr TU Ke Ke Ke Ke -pp -pp -pp -Sa -pp +Xr +Xr +Xr +vR +Xr hX MW MW @@ -17689,9 +17737,9 @@ MW MW MW dF -vq -pp -pp +BU +Xr +Xr DZ DZ WB @@ -17702,25 +17750,25 @@ Ir DZ Ir Ir -rE -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp +up +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr eW -pp +Xr hX MW MW @@ -17826,9 +17874,9 @@ MW MW cP yY -pp -vq -eT +Xr +BU +Ym DZ KN jP @@ -17839,25 +17887,25 @@ Ir oi Ir Ir -rE -pp -pp +up +Xr +Xr TU -pp -pp -pp -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr TU -pp -pp -pp -Bq -pp +Xr +Xr +Xr +eT +Xr hX MW MW @@ -17962,8 +18010,8 @@ MW MW MW dF -pp -pp +Xr +Xr DZ zl DZ @@ -17976,25 +18024,25 @@ Ir JX Ir Ir -rE -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp +up +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr eW -pp +Xr Jr MW MW @@ -18099,8 +18147,8 @@ MW MW MW dF -pp -pp +Xr +Xr DZ cZ ml @@ -18113,25 +18161,25 @@ Ir QK Ir Ir -rE -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp +up +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr PE -pp -HT -pp +Xr +Us +Xr hX MW MW @@ -18237,10 +18285,10 @@ MW MW dF TU -pp +Xr DZ AK -Hg +Uu DZ DZ gF @@ -18249,26 +18297,26 @@ DZ DZ Cz Ir -Lv -Un -pp -pp +HT +ll +Xr +Xr Hv -pp -pp -pp -pp -pp -pp -pp -pp -pp -xY -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +CC +Xr +Xr +Xr +Xr +Xr hX MW MW @@ -18373,8 +18421,8 @@ MW MW MW dF -pp -pp +Xr +Xr DZ ai cZ @@ -18385,27 +18433,27 @@ jP KN DZ DZ -eg -Un -pp -pp -pp -pp -pp +yF +ll +Xr +Xr +Xr +Xr +Xr yT -Ms -Ms -Ms -On -pp -pp -eW -es -An -pp -pp -pp -pp +AD +AD +AD +eg +Xr +Xr +eW +EY +YV +Xr +Xr +Xr +Xr hX MW MW @@ -18511,7 +18559,7 @@ MW MW sc eV -pp +Xr DZ DZ cZ @@ -18522,26 +18570,26 @@ jP KN DZ gk -pp -pp -pp -pp +Xr +Xr +Xr +Xr PE -pp +Xr yT Fr Mc Mc Mc +Un +eg +Sa Hy -On -lC -AD Ke -pp -pp -pp -vq +Xr +Xr +Xr +BU SE bF MW @@ -18648,8 +18696,8 @@ MW MW MW dF -vq -QH +BU +Bt DZ hG hG @@ -18659,24 +18707,24 @@ KN DZ DZ HE -pp -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr +Xr ZM cy Mc Mc Mc Mc -RC -pp -pp -pp -pp -Uu +EX +Xr +Xr +Xr +Xr +zt Hv SE bF @@ -18786,35 +18834,35 @@ MW MW sc eV -pp -pp -pp -pp -pp +Xr +Xr +Xr +Xr +Xr DZ DZ DZ ZL -pp +Xr xf -pp -pp -pp -pp -pp -BW +Xr +Xr +Xr +Xr +Xr +Xh hV Mc Mc Mc Mc DJ -pp +Xr Jh -pp -pp -pp -pp +Xr +Xr +Xr +Xr hX MW MW @@ -18924,20 +18972,20 @@ MW MW sc eV -pp -lC -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp -pp +Xr +Sa +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr +Xr sJ DZ DZ @@ -18946,11 +18994,11 @@ DZ DZ DZ DZ -qh -pp -pp -pp -pp +FK +Xr +Xr +Xr +Xr SE bF MW @@ -19062,18 +19110,18 @@ MW MW sc eV -pp -pp -pp -pp -pp -pp -pp -xY -xY -pp -xY -xY +Xr +Xr +Xr +Xr +Xr +Xr +Xr +CC +CC +Xr +CC +CC Vz DZ DZ @@ -19084,8 +19132,8 @@ Zz KE DZ DZ -pp -pp +Xr +Xr SE hu bF @@ -19200,18 +19248,18 @@ MW MW dF TU -pp +Xr DZ DZ DZ -pp -pp -pp -pp -pp -pp -pp -CC +Xr +Xr +Xr +Xr +Xr +Xr +Xr +gM GM Ir hg @@ -19337,17 +19385,17 @@ MW MW sc eV -pp +Xr DZ MT fM -pp -pp -JC -JC -JC -JC -PV +Xr +Xr +Xv +Xv +Xv +Xv +ee LD DZ FX @@ -19478,14 +19526,14 @@ eV DZ DZ DZ -pp -XJ -pp -pp -pp -pp -pp -pp +Xr +Cf +Xr +Xr +Xr +Xr +Xr +Xr DZ DZ hn @@ -19494,7 +19542,7 @@ hn hn hn tF -WW +Ve DZ MW MW @@ -19613,16 +19661,16 @@ MW MW sc eV -vq -pp -pp -sB -XW -pp -pp -pp -vR -pp +BU +Xr +Xr +Ze +pm +Xr +Xr +Xr +Lv +Xr JW DZ Of @@ -19750,14 +19798,14 @@ MW MW MW dF -pp +Xr Hv -lC -pp -pp -pp -pp -BK +Sa +Xr +Xr +Xr +Xr +Ae SE Ic bF @@ -19888,10 +19936,10 @@ MW MW sc eV -EY -pp -pp -vq +LG +Xr +Xr +BU SE hu hu diff --git a/modular_ss220/maps220/code/floors.dm b/modular_ss220/maps220/code/floors.dm index 2288ae0df021..26a8c50bbfa9 100644 --- a/modular_ss220/maps220/code/floors.dm +++ b/modular_ss220/maps220/code/floors.dm @@ -18,7 +18,7 @@ baseturf = /turf/simulated/floor/beach/away/water/deep /turf/simulated/floor/beach/away/water/deep/dense_canpass/CanPass (atom/movable/mover, border_dir) - .=..() + . = ..() if(isliving(mover) || ismecha (mover)) return FALSE @@ -26,6 +26,7 @@ icon = 'modular_ss220/maps220/icons/floors.dmi' icon_state = "sand" base_icon_state = "sand" + mouse_opacity = MOUSE_OPACITY_ICON water_overlay_image = null baseturf = /turf/simulated/floor/beach/away/sand_alternative @@ -34,6 +35,15 @@ if(prob(15)) icon_state = "sand[rand(1,4)]" +/turf/simulated/floor/beach/away/sand_alternative/remove_plating(mob/user) + return + +/turf/simulated/floor/beach/away/sand_alternative/crowbar_act(mob/user, obj/item/I) + return + +/turf/simulated/floor/beach/away/sand_alternative/try_replace_tile(obj/item/stack/tile/T, mob/user, params) + return + /turf/simulated/floor/beach/away/coastline/alternative icon = 'modular_ss220/maps220/icons/floors.dmi' icon_state = "beach" diff --git a/modular_ss220/objects/code/big_bed.dm b/modular_ss220/objects/code/big_bed.dm index f5d37e254ee7..e6a812368c14 100644 --- a/modular_ss220/objects/code/big_bed.dm +++ b/modular_ss220/objects/code/big_bed.dm @@ -11,7 +11,7 @@ /obj/structure/bed/double/post_buckle_mob(mob/living/target) if(buckled_mobs.len > 1 && !goldilocks) // Push the second buckled mob a bit higher from the normal lying position - target.pixel_y = target.pixel_y + 6 + target.pixel_y = target.pixel_y + 12 goldilocks = target /obj/structure/bed/double/post_unbuckle_mob(mob/living/target) diff --git a/modular_ss220/objects/code/plastic_chair.dm b/modular_ss220/objects/code/plastic_chair.dm index 0f0393b39648..6c1ed313bc08 100644 --- a/modular_ss220/objects/code/plastic_chair.dm +++ b/modular_ss220/objects/code/plastic_chair.dm @@ -1,5 +1,5 @@ /obj/structure/chair/plastic - name = "складной пластиковый стул" + name = "\improper складной пластиковый стул" desc = "Как бы вы ни ёрзали, все равно будет неудобно." icon = 'modular_ss220/objects/icons/plastic.dmi' icon_state = "plastic_chair" @@ -27,7 +27,7 @@ qdel(src) /obj/item/chair/plastic - name = "складной пластиковый стул" + name = "\improper складной пластиковый стул" desc = "Почему-то, всегда можно найти под рингом." icon = 'modular_ss220/objects/icons/plastic.dmi' icon_state = "folded_chair" @@ -41,7 +41,7 @@ origin_type = /obj/structure/chair/plastic /obj/effect/decal/cleanable/plastic - name = "пластиковые осколки" + name = "\improper пластиковые осколки" desc = "Куски рваного, сломанного, никчёмного пластика." icon = 'icons/obj/objects.dmi' icon_state = "shards"