From 9340320bb67e1def6356433fedb4894138eee62a Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Mon, 27 May 2024 00:02:38 -0400 Subject: [PATCH 01/10] Com Tech Plasteel QOL 5 full plasteel cades --- .../machinery/vending/vendor_types/squad_prep/squad_engineer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index 998b17504a44..c409f0cc3d1b 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( /obj/item/explosive/plastic, /obj/item/stack/sandbags_empty = 25, /obj/item/stack/sheet/metal/large_stack, - /obj/item/stack/sheet/plasteel/medium_stack, + /obj/item/stack/sheet/plasteel/medium_stack = 40, /obj/item/cell/high, /obj/item/tool/shovel/etool/folded, /obj/item/device/lightreplacer, From 365a4905aa5df100f5a4731085c83888beb3d216 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Mon, 27 May 2024 00:03:18 -0400 Subject: [PATCH 02/10] Allow Surgery and construction in shallow puddles --- code/game/turfs/floors/desert.dm | 19 +++ code/game/turfs/open.dm | 12 ++ maps/map_files/DesertDam/Desert_Dam.dmm | 69 +++++--- maps/map_files/Kutjevo/Kutjevo.dmm | 94 ++++++----- maps/map_files/New_Varadero/New_Varadero.dmm | 58 +++++-- .../Sorokyne_Strata/Sorokyne_Strata.dmm | 148 +++++++++++++----- 6 files changed, 297 insertions(+), 103 deletions(-) diff --git a/code/game/turfs/floors/desert.dm b/code/game/turfs/floors/desert.dm index 46a481e3bc64..b6abb281e721 100644 --- a/code/game/turfs/floors/desert.dm +++ b/code/game/turfs/floors/desert.dm @@ -126,6 +126,11 @@ /turf/open/desert/desert_shore/desert_shore1 name = "shore" icon_state = "shore1" + +/turf/open/desert/desert_shore/desert_shore1/can_surgery + allow_construction = TRUE + supports_surgery = TRUE + /* /turf/open/desert/desert_shore/desert_shore2 name = "shore" @@ -139,12 +144,23 @@ /turf/open/desert/desert_shore/shore_edge1 name = "shore" icon_state = "shore_edge1" +/turf/open/desert/desert_shore/shore_edge1/can_surgery + allow_construction = TRUE + supports_surgery = TRUE + /turf/open/desert/desert_shore/shore_corner1 name = "shore" icon_state = "shore_corner1" +/turf/open/desert/desert_shore/shore_corner1/can_surgery + allow_construction = TRUE + supports_surgery = TRUE + /turf/open/desert/desert_shore/shore_corner2 name = "shore" icon_state = "shore_corner2" +/turf/open/desert/desert_shore/shore_corner2/can_surgery + allow_construction = TRUE + supports_surgery = TRUE //Desert Waterway /turf/open/desert/waterway @@ -236,6 +252,9 @@ /turf/open/gm/river/desert/shallow icon_state = "shallow" icon_overlay = "_shallow" +/turf/open/gm/river/desert/shallow/can_surgery + allow_construction = TRUE + supports_surgery = TRUE /turf/open/gm/river/desert/shallow/covered covered = 1 diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 8d9ded899a70..2d6548d1a59f 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -468,6 +468,9 @@ baseturfs = /turf/open/gm/river supports_surgery = FALSE minimap_color = MINIMAP_WATER +/turf/open/gm/river/can_surgery + allow_construction = TRUE + supports_surgery = TRUE /turf/open/gm/river/Initialize(mapload, ...) . = ..() @@ -605,6 +608,9 @@ icon_state = "beach" baseturfs = /turf/open/gm/coast supports_surgery = FALSE +/turf/open/gm/coast/can_surgery + allow_construction = TRUE + supports_surgery = TRUE /turf/open/gm/coast/north @@ -619,6 +625,9 @@ /turf/open/gm/coast/beachcorner icon_state = "beachcorner" +/turf/open/gm/coast/beachcorner/can_surgery + allow_construction = TRUE + supports_surgery = TRUE /turf/open/gm/coast/beachcorner/north_west @@ -633,6 +642,9 @@ /turf/open/gm/coast/beachcorner2 icon_state = "beachcorner2" +/turf/open/gm/coast/beachcorner2/can_surgery + allow_construction = TRUE + supports_surgery = TRUE /turf/open/gm/coast/beachcorner2/north_west diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index 3c4125023686..b104abb30d15 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -61011,6 +61011,11 @@ icon_state = "tile" }, /area/desert_dam/exterior/valley/south_valley_dam) +"hef" = ( +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ + dir = 4 + }, +/area/desert_dam/exterior/valley/valley_crashsite) "het" = ( /obj/structure/surface/table, /obj/structure/machinery/computer/objective, @@ -61559,6 +61564,11 @@ icon_state = "cement_sunbleached15" }, /area/desert_dam/exterior/valley/valley_hydro) +"iQO" = ( +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ + dir = 4 + }, +/area/desert_dam/exterior/valley/valley_crashsite) "iRU" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 @@ -62366,6 +62376,11 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/exterior/valley/south_valley_dam) +"lVs" = ( +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ + dir = 8 + }, +/area/desert_dam/exterior/valley/valley_crashsite) "lVW" = ( /obj/effect/decal/sand_overlay/sand1{ dir = 4 @@ -63917,6 +63932,9 @@ icon_state = "bluecorner" }, /area/desert_dam/interior/dam_interior/tech_storage) +"rqH" = ( +/turf/open/gm/river/desert/shallow/can_surgery, +/area/desert_dam/exterior/valley/valley_crashsite) "rtW" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/asphalt/cement_sunbleached{ @@ -64107,6 +64125,9 @@ name = "reinforced metal wall" }, /area/desert_dam/exterior/rock) +"rTW" = ( +/turf/open/gm/river/desert/deep, +/area/desert_dam/interior/caves/temple) "rUA" = ( /obj/structure/fence, /turf/open/desert/dirt{ @@ -64325,6 +64346,9 @@ icon_state = "cement_sunbleached4" }, /area/desert_dam/exterior/valley/valley_hydro) +"syH" = ( +/turf/open/desert/desert_shore/desert_shore1/can_surgery, +/area/desert_dam/exterior/valley/valley_crashsite) "sDf" = ( /obj/effect/decal/cleanable/generic, /turf/open/floor/prison{ @@ -64352,6 +64376,12 @@ }, /turf/open/shuttle/can_surgery/red, /area/desert_dam/interior/dam_interior/hanger) +"sGs" = ( +/obj/effect/decal/sand_overlay/sand1/corner1{ + dir = 8 + }, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, +/area/desert_dam/exterior/valley/valley_crashsite) "sGP" = ( /obj/structure/shuttle/diagonal{ icon_state = "swall_f5" @@ -64754,6 +64784,9 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) +"tRT" = ( +/turf/open/gm/river/desert/deep, +/area/desert_dam/exterior/valley/valley_crashsite) "tSK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -105314,7 +105347,7 @@ dTs dTs dTs dTs -aJx +sGs aJM adA dTs @@ -105547,8 +105580,8 @@ dTs dTs dTs dTs -aIv -aJB +rqH +syH acZ adA dTs @@ -105781,8 +105814,8 @@ dTs dTs dTs dTs -aIv -aJB +rqH +syH njF adA dTs @@ -106015,8 +106048,8 @@ dTs dTs dTs dTs -aIv -aJB +rqH +syH uGU aJM dTs @@ -106249,8 +106282,8 @@ dTs dTs dTs dTs -aIv -aJB +rqH +syH aIy adr adA @@ -106482,9 +106515,9 @@ dTs dTs dTs dTs -aIv -aIF -aIG +rqH +iQO +lVs acZ adA adA @@ -106715,9 +106748,9 @@ azT dTs dTs dTs -aIx -aIx -aIG +hef +hef +lVs aIy adr adA @@ -115833,7 +115866,7 @@ dTs dTs dTs dTs -aIv +tRT aIv aIF aIG @@ -117720,8 +117753,8 @@ dTs dTs uhf ioA -ioA -ioA +rTW +rTW ioA ktJ aBE diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index b1beb0dfc2b1..c03cafb824bb 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -1093,6 +1093,11 @@ }, /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_bridge) +"bCz" = ( +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ + dir = 4 + }, +/area/kutjevo/exterior/lz_dunes) "bDg" = ( /obj/structure/reagent_dispensers/water_cooler, /turf/open/floor/kutjevo/multi_tiles{ @@ -1192,8 +1197,10 @@ }, /area/kutjevo/interior/oob/dev_room) "bGD" = ( -/turf/open/desert/desert_shore/shore_edge1, -/area/kutjevo/exterior/lz_dunes) +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ + dir = 1 + }, +/area/kutjevo/exterior/scrubland) "bGV" = ( /obj/structure/bed/chair{ dir = 8 @@ -1278,6 +1285,12 @@ }, /turf/open/floor/mech_bay_recharge_floor, /area/kutjevo/interior/colony_central/mine_elevator) +"bMo" = ( +/obj/structure/flora/bush/ausbushes/reedbush, +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ + dir = 4 + }, +/area/kutjevo/exterior/scrubland) "bMu" = ( /obj/structure/bed/sofa/south/grey, /turf/open/floor/kutjevo/tan/grey_edge{ @@ -2646,7 +2659,7 @@ }, /area/kutjevo/exterior/lz_river) "dyW" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/kutjevo/exterior/Northwest_Colony) @@ -2672,7 +2685,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/power) "dzH" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 1 }, /area/kutjevo/exterior/lz_dunes) @@ -2745,7 +2758,7 @@ /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/Northwest_Colony) "dDL" = ( -/turf/open/gm/river/desert/shallow, +/turf/open/gm/river/desert/shallow/can_surgery, /area/kutjevo/exterior/Northwest_Colony) "dEI" = ( /obj/effect/decal/cleanable/blood/oil, @@ -2836,7 +2849,7 @@ /turf/open/floor/kutjevo/tan, /area/kutjevo/interior/complex/botany) "dJs" = ( -/turf/open/gm/river/desert/shallow, +/turf/open/gm/river/desert/shallow/can_surgery, /area/kutjevo/exterior/scrubland) "dJT" = ( /obj/structure/window/framed/kutjevo, @@ -2913,7 +2926,7 @@ /obj/structure/flora/bush/ausbushes/reedbush{ pixel_y = 14 }, -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/kutjevo/exterior/Northwest_Colony) "dQq" = ( /obj/structure/flora/grass/tallgrass/desert/corner{ @@ -3647,7 +3660,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_South/power2) "eFy" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 1 }, /area/kutjevo/exterior/Northwest_Colony) @@ -4300,7 +4313,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power) "fui" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 1 }, /area/kutjevo/exterior/scrubland) @@ -4996,7 +5009,7 @@ /turf/closed/wall/kutjevo/colony, /area/kutjevo/interior/complex/med) "gxs" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 4 }, /area/kutjevo/exterior/scrubland) @@ -7010,7 +7023,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power/comms) "jvt" = ( -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/kutjevo/exterior/scrubland) "jvQ" = ( /obj/structure/platform/kutjevo/smooth{ @@ -7106,6 +7119,9 @@ /obj/structure/blocker/invisible_wall, /turf/open/auto_turf/sand/layer0, /area/kutjevo/interior/oob/dev_room) +"jBW" = ( +/turf/open/desert/desert_shore/shore_edge1/can_surgery, +/area/kutjevo/exterior/lz_dunes) "jBX" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/auto_turf/sand/layer0, @@ -7694,7 +7710,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/stonyfields) "kvU" = ( -/turf/open/desert/desert_shore/shore_corner2, +/turf/open/desert/desert_shore/shore_corner2/can_surgery, /area/kutjevo/exterior/lz_dunes) "kwy" = ( /turf/closed/wall/kutjevo/colony/reinforced/hull, @@ -8353,7 +8369,7 @@ /turf/open/floor/plating/kutjevo, /area/kutjevo/interior/power/comms) "lrx" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 4 }, /area/kutjevo/exterior/lz_dunes) @@ -8823,7 +8839,7 @@ /area/kutjevo/interior/complex/Northwest_Flight_Control) "mbh" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 1 }, /area/kutjevo/exterior/scrubland) @@ -9001,7 +9017,7 @@ /area/kutjevo/interior/complex/botany/east_tech) "mjW" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 1 }, /area/kutjevo/exterior/Northwest_Colony) @@ -9030,7 +9046,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/colony_South/power2) "mnk" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/kutjevo/exterior/lz_dunes) @@ -11797,7 +11813,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/exterior/Northwest_Colony) "pPJ" = ( -/turf/open/gm/river/desert/shallow, +/turf/open/gm/river/desert/shallow/can_surgery, /area/kutjevo/exterior/lz_dunes) "pQN" = ( /obj/structure/platform_decoration/kutjevo/rock{ @@ -12614,7 +12630,7 @@ /area/kutjevo/exterior/runoff_dunes) "rfz" = ( /obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 4 }, /area/kutjevo/exterior/Northwest_Colony) @@ -12662,7 +12678,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/interior/colony_north) "rih" = ( -/turf/open/desert/desert_shore/shore_corner2{ +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ dir = 8 }, /area/kutjevo/exterior/lz_dunes) @@ -13008,7 +13024,7 @@ /turf/open/asphalt/cement_sunbleached, /area/kutjevo/exterior/scrubland) "rHy" = ( -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/kutjevo/exterior/lz_dunes) "rHE" = ( /obj/structure/cargo_container/grant/left, @@ -14217,7 +14233,7 @@ /turf/open/floor/kutjevo/tan/multi_tiles, /area/kutjevo/interior/colony_South/power2) "tnI" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 4 }, /area/kutjevo/exterior/Northwest_Colony) @@ -14546,7 +14562,7 @@ /turf/open/auto_turf/sand/layer0, /area/kutjevo/exterior/runoff_dunes) "tIY" = ( -/turf/open/desert/desert_shore/shore_edge1, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, /area/kutjevo/exterior/Northwest_Colony) "tKC" = ( /obj/structure/bed/sofa/vert/white, @@ -14933,7 +14949,7 @@ /turf/open/floor/kutjevo/multi_tiles, /area/kutjevo/interior/colony_central) "umQ" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/kutjevo/exterior/scrubland) @@ -15302,10 +15318,10 @@ /turf/open/floor/kutjevo, /area/kutjevo/interior/oob/dev_room) "uMg" = ( -/turf/open/desert/desert_shore/shore_edge1{ - dir = 4 +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ + dir = 8 }, -/area/kutjevo/exterior/lz_dunes) +/area/kutjevo/exterior/scrubland) "uML" = ( /obj/item/ammo_magazine/rifle/mar40/extended, /obj/item/ammo_magazine/rifle/mar40/extended, @@ -15834,7 +15850,7 @@ /turf/closed/wall/kutjevo/rock, /area/kutjevo/interior/colony_N_East) "vsS" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 1 }, /area/kutjevo/exterior/lz_dunes) @@ -17369,7 +17385,7 @@ /obj/structure/flora/bush/ausbushes/reedbush{ pixel_y = 14 }, -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/kutjevo/exterior/scrubland) "xIo" = ( /obj/structure/prop/dam/large_boulder/boulder2, @@ -17538,7 +17554,7 @@ /turf/open/auto_turf/sand/layer1, /area/kutjevo/exterior/scrubland) "xYt" = ( -/turf/open/desert/desert_shore/shore_edge1, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, /area/kutjevo/exterior/scrubland) "xYR" = ( /obj/item/stack/sheet/wood, @@ -17649,7 +17665,7 @@ /turf/open/floor/kutjevo/colors/orange, /area/kutjevo/interior/power) "yfc" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 8 }, /area/kutjevo/exterior/Northwest_Colony) @@ -19955,7 +19971,7 @@ dxF dxF vei vsS -bGD +jBW oqQ sHu dxF @@ -20290,7 +20306,7 @@ prJ wGH dzH kvU -bGD +jBW prJ nZl dxF @@ -20458,7 +20474,7 @@ wGH dzH pPJ kvU -bGD +jBW prJ dxF dxF @@ -20622,7 +20638,7 @@ vei wGH prJ wGH -uMg +bCz rih pPJ rHy @@ -20790,7 +20806,7 @@ prJ wGH jqt prJ -uMg +bCz lrx mnk dxF @@ -23232,7 +23248,7 @@ dxF dxF dxF dxF -dsp +bGD dJs xIk bXl @@ -26071,7 +26087,7 @@ kIn bXl bXl fui -rsV +uMg xYt via bEp @@ -26237,7 +26253,7 @@ bXl sYd bXl bEp -dsp +bGD dJs jvt bTa @@ -26405,7 +26421,7 @@ kIn bEp bEp gxs -kjo +bMo umQ bEp bEp diff --git a/maps/map_files/New_Varadero/New_Varadero.dmm b/maps/map_files/New_Varadero/New_Varadero.dmm index 5c85b09864e1..1d06023a0eda 100644 --- a/maps/map_files/New_Varadero/New_Varadero.dmm +++ b/maps/map_files/New_Varadero/New_Varadero.dmm @@ -6334,7 +6334,7 @@ pixel_y = 9; pixel_x = -8 }, -/turf/open/gm/coast/beachcorner2/north_west, +/turf/open/gm/coast/beachcorner2/can_surgery, /area/varadero/exterior/lz2_near) "eia" = ( /obj/effect/overlay/palmtree_r{ @@ -10673,6 +10673,11 @@ icon_state = "asteroidplating" }, /area/varadero/interior/maintenance) +"gSB" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 8 + }, +/area/varadero/exterior/lz2_near) "gSC" = ( /obj/structure/machinery/light/small, /turf/open/floor/plating/icefloor{ @@ -11795,6 +11800,9 @@ icon_state = "wood-broken" }, /area/varadero/interior/court) +"hJb" = ( +/turf/open/gm/coast/beachcorner/can_surgery, +/area/varadero/exterior/lz2_near) "hJl" = ( /obj/structure/machinery/firealarm{ pixel_y = 24 @@ -17501,6 +17509,11 @@ icon_state = "red" }, /area/varadero/interior/administration) +"lrs" = ( +/turf/open/gm/coast/can_surgery{ + dir = 1 + }, +/area/varadero/exterior/lz2_near) "lrR" = ( /obj/structure/girder/displaced, /turf/open/floor/plating/icefloor{ @@ -18138,6 +18151,9 @@ icon_state = "wred" }, /area/varadero/interior/medical) +"lJq" = ( +/turf/open/gm/river/can_surgery, +/area/varadero/exterior/lz2_near) "lKI" = ( /obj/structure/surface/table/reinforced/prison, /obj/item/reagent_container/glass/beaker/ethanol{ @@ -18628,6 +18644,11 @@ icon_state = "asteroidplating" }, /area/varadero/interior_protected/maintenance/south) +"lYR" = ( +/turf/open/gm/coast/can_surgery{ + dir = 8 + }, +/area/varadero/exterior/lz2_near) "lZa" = ( /obj/structure/prop/structure_lattice{ density = 0; @@ -30039,7 +30060,7 @@ /area/varadero/interior/medical) "tez" = ( /obj/item/toy/bikehorn/rubberducky, -/turf/open/gm/coast/beachcorner/north_west, +/turf/open/gm/coast/beachcorner/can_surgery, /area/varadero/exterior/lz2_near) "teH" = ( /obj/structure/window/framed/colony, @@ -34176,6 +34197,11 @@ /obj/item/device/flashlight/lamp/tripod, /turf/open/auto_turf/sand_white/layer1, /area/varadero/interior_protected/caves/central) +"vOp" = ( +/turf/open/gm/coast/can_surgery{ + dir = 4 + }, +/area/varadero/exterior/lz2_near) "vOr" = ( /obj/structure/pipes/standard/simple/hidden/green{ dir = 4 @@ -37407,6 +37433,11 @@ }, /turf/open/floor/wood, /area/varadero/interior/beach_bar) +"xRg" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 1 + }, +/area/varadero/exterior/lz2_near) "xRt" = ( /obj/structure/pipes/standard/manifold/hidden/green{ dir = 4 @@ -37836,6 +37867,11 @@ }, /turf/open/gm/dirt, /area/varadero/interior/maintenance/north) +"yeP" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 4 + }, +/area/varadero/exterior/lz2_near) "yeR" = ( /obj/structure/pipes/standard/simple/hidden/green, /obj/item/stack/tile/plasteel{ @@ -62153,8 +62189,8 @@ aQN sKz wlB tez -tmZ -rXk +vOp +gSB wlB aQN hmh @@ -62333,10 +62369,10 @@ wlB jwX wlB wlB -qNX +hJb ehY -urD -nsN +lJq +lrs lTg aQN aQN @@ -62515,10 +62551,10 @@ wlB wlB mdg wlB -beK -cVq -cVq -mtT +xRg +lYR +lYR +yeP wlB aQN aQN diff --git a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm index db1f07a8b3b1..e863995f28fd 100644 --- a/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm +++ b/maps/map_files/Sorokyne_Strata/Sorokyne_Strata.dmm @@ -14457,10 +14457,12 @@ /turf/open/auto_turf/strata_grass/layer1, /area/strata/ug/interior/jungle/deep/east_dorms) "aSC" = ( -/turf/open/gm/coast/beachcorner/north_west, +/turf/open/gm/coast/beachcorner/can_surgery, /area/strata/ug/interior/jungle/deep/north_carp) "aSD" = ( -/turf/open/gm/coast/beachcorner/north_east, +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 1 + }, /area/strata/ug/interior/jungle/deep/north_carp) "aSF" = ( /obj/structure/flora/bush/ausbushes/var3/fullgrass, @@ -14903,10 +14905,12 @@ }, /area/strata/ag/interior/outpost/canteen) "aUg" = ( -/turf/open/gm/river, +/turf/open/gm/river/can_surgery, /area/strata/ug/interior/jungle/deep/north_carp) "aUh" = ( -/turf/open/gm/coast/east, +/turf/open/gm/coast/can_surgery{ + dir = 8 + }, /area/strata/ug/interior/jungle/deep/north_carp) "aUn" = ( /obj/structure/platform/strata/metal, @@ -15333,13 +15337,19 @@ }, /area/strata/ag/interior/outpost/maint/canteen_e_1) "aVK" = ( -/turf/open/gm/coast/beachcorner2/south_east, +/turf/open/gm/coast/beachcorner2/can_surgery{ + dir = 8 + }, /area/strata/ug/interior/jungle/deep/north_carp) "aVL" = ( -/turf/open/gm/coast/beachcorner2/south_west, +/turf/open/gm/coast/beachcorner2/can_surgery{ + dir = 4 + }, /area/strata/ug/interior/jungle/deep/north_carp) "aVM" = ( -/turf/open/gm/coast/beachcorner2/north_east, +/turf/open/gm/coast/beachcorner2/can_surgery{ + dir = 1 + }, /area/strata/ug/interior/jungle/deep/north_carp) "aVN" = ( /obj/structure/flora/bush/ausbushes/grassybush{ @@ -15359,10 +15369,12 @@ /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/hotsprings) "aVS" = ( -/turf/open/gm/coast/beachcorner/north_west, +/turf/open/gm/coast/beachcorner/can_surgery, /area/strata/ug/interior/jungle/deep/hotsprings) "aVT" = ( -/turf/open/gm/coast/beachcorner/north_east, +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 1 + }, /area/strata/ug/interior/jungle/deep/hotsprings) "aVW" = ( /obj/structure/platform/strata/metal{ @@ -15722,7 +15734,9 @@ /turf/closed/wall/strata_outpost, /area/strata/ug/interior/outpost/jung/dorms/admin4) "aXr" = ( -/turf/open/gm/coast/beachcorner/south_west, +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 8 + }, /area/strata/ug/interior/jungle/deep/north_carp) "aXs" = ( /obj/structure/machinery/door/airlock/almayer/engineering/colony, @@ -15732,10 +15746,14 @@ }, /area/strata/ag/exterior/shed_five_caves) "aXt" = ( -/turf/open/gm/coast/beachcorner/south_west, +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 8 + }, /area/strata/ug/interior/jungle/deep/hotsprings) "aXu" = ( -/turf/open/gm/coast/beachcorner/south_east, +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 4 + }, /area/strata/ug/interior/jungle/deep/hotsprings) "aXv" = ( /obj/structure/platform/strata/metal{ @@ -16341,7 +16359,7 @@ /turf/open/auto_turf/snow/brown_base/layer1, /area/strata/ag/exterior/paths/adminext) "aZL" = ( -/turf/open/gm/coast/beachcorner2/north_west, +/turf/open/gm/coast/beachcorner2/can_surgery, /area/strata/ug/interior/jungle/deep/north_carp) "aZO" = ( /turf/open/gm/dirt, @@ -28191,7 +28209,7 @@ }, /area/strata/ag/interior/outpost/canteen/bar) "cmu" = ( -/turf/open/gm/coast/north, +/turf/open/gm/coast/can_surgery, /area/strata/ug/interior/jungle/deep/north_carp) "cmA" = ( /turf/open/asphalt/cement{ @@ -28498,7 +28516,9 @@ /turf/open/floor/strata, /area/strata/ag/interior/outpost/engi/drome) "cor" = ( -/turf/open/gm/coast/west, +/turf/open/gm/coast/can_surgery{ + dir = 4 + }, /area/strata/ug/interior/jungle/deep/north_carp) "cot" = ( /obj/structure/platform_decoration/strata/metal{ @@ -30185,6 +30205,9 @@ icon_state = "floor2" }, /area/strata/ug/interior/outpost/jung/dorms/sec1) +"dKg" = ( +/turf/open/gm/coast/beachcorner/can_surgery, +/area/strata/ug/interior/jungle/deep/tearlake) "dKj" = ( /turf/closed/wall/strata_ice/jungle, /area/strata/ug/interior/jungle/deep/tearlake) @@ -31550,7 +31573,9 @@ }, /area/strata/ag/interior/outpost/med) "gcj" = ( -/turf/open/gm/coast/beachcorner2/south_east, +/turf/open/gm/coast/beachcorner2/can_surgery{ + dir = 8 + }, /area/strata/ug/interior/jungle/deep/tearlake) "gdZ" = ( /obj/structure/machinery/smartfridge, @@ -32148,6 +32173,11 @@ }, /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/marsh/crash) +"gVq" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 8 + }, +/area/strata/ug/interior/jungle/deep/tearlake) "gVJ" = ( /obj/effect/blocker/sorokyne_cold_water, /obj/effect/blocker/sorokyne_cold_water, @@ -34175,6 +34205,9 @@ icon_state = "fake_wood" }, /area/strata/ag/interior/research_decks/security) +"kuF" = ( +/turf/open/gm/coast/can_surgery, +/area/strata/ug/interior/jungle/deep/tearlake) "kvY" = ( /obj/structure/flora/bush/ausbushes/grassybush, /turf/open/auto_turf/strata_grass/layer1, @@ -36358,7 +36391,7 @@ /turf/closed/wall/strata_outpost/reinforced/hull, /area/strata/ag/exterior/tcomms/tcomms_deck) "oeO" = ( -/turf/open/gm/coast/beachcorner/north_west, +/turf/open/gm/coast/beachcorner/can_surgery, /area/strata/ug/interior/jungle/deep/east_carp) "oeQ" = ( /turf/open/floor/strata{ @@ -36680,6 +36713,9 @@ icon_state = "orange_cover" }, /area/strata/ag/interior/tcomms) +"oNj" = ( +/turf/open/gm/river/can_surgery, +/area/strata/ug/interior/jungle/deep/tearlake) "oOB" = ( /obj/item/clothing/shoes/snow, /obj/structure/surface/rack, @@ -36826,6 +36862,11 @@ icon_state = "cyan1" }, /area/strata/ag/interior/dorms) +"oYJ" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 4 + }, +/area/strata/ug/interior/jungle/deep/east_carp) "oZt" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/strata{ @@ -37865,6 +37906,11 @@ icon_state = "floor3" }, /area/strata/ag/interior/tcomms) +"qCi" = ( +/turf/open/gm/coast/can_surgery{ + dir = 8 + }, +/area/strata/ug/interior/jungle/deep/tearlake) "qCv" = ( /obj/structure/pipes/standard/manifold/fourway/hidden/cyan, /turf/open/floor/strata{ @@ -38516,6 +38562,11 @@ icon_state = "orange_cover" }, /area/strata/ag/interior/outpost/engi/drome) +"rDL" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 4 + }, +/area/strata/ug/interior/jungle/deep/tearlake) "rEr" = ( /obj/structure/platform/strata/metal{ dir = 1 @@ -38553,7 +38604,9 @@ /turf/open/auto_turf/ice/layer1, /area/strata/ag/exterior/nearlz2) "rIM" = ( -/turf/open/gm/coast/south, +/turf/open/gm/coast/can_surgery{ + dir = 1 + }, /area/strata/ug/interior/jungle/deep/north_carp) "rJf" = ( /turf/open/floor/strata{ @@ -39354,6 +39407,11 @@ /obj/structure/flora/grass/ice/brown/snowgrassbb_1, /turf/open/auto_turf/snow/brown_base/layer2, /area/strata/ag/exterior/shed_five_caves) +"tfU" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 1 + }, +/area/strata/ug/interior/jungle/deep/east_carp) "tgr" = ( /obj/structure/stairs/perspective{ color = "#6e6e6e"; @@ -39418,12 +39476,22 @@ /obj/effect/decal/cleanable/blood/gibs/core, /turf/open/floor/strata, /area/strata/ug/interior/outpost/jung/dorms/sec1) +"tjT" = ( +/turf/open/gm/coast/can_surgery{ + dir = 4 + }, +/area/strata/ug/interior/jungle/deep/tearlake) "tkq" = ( /obj/structure/platform_decoration/strata/metal{ dir = 1 }, /turf/open/auto_turf/strata_grass/layer0, /area/strata/ug/interior/jungle/platform/east/scrub) +"tkx" = ( +/turf/open/gm/coast/can_surgery{ + dir = 1 + }, +/area/strata/ug/interior/jungle/deep/tearlake) "tlc" = ( /obj/structure/surface/rack, /obj/item/storage/box/beakers, @@ -41276,6 +41344,11 @@ /obj/structure/pipes/standard/simple/hidden/cyan, /turf/open/auto_turf/ice/layer0, /area/strata/ag/exterior/marsh) +"wcV" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 8 + }, +/area/strata/ug/interior/jungle/deep/east_carp) "wdf" = ( /obj/structure/bookcase{ icon_state = "book-5" @@ -41623,6 +41696,11 @@ /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /turf/open/gm/dirt, /area/strata/ug/interior/jungle/deep/east_engi) +"wPc" = ( +/turf/open/gm/coast/beachcorner/can_surgery{ + dir = 1 + }, +/area/strata/ug/interior/jungle/deep/tearlake) "wPp" = ( /obj/effect/blocker/sorokyne_cold_water, /obj/structure/platform/strata, @@ -72301,10 +72379,10 @@ aad aad jLb jLb -ahK -dIh -dIh -mMp +dKg +tjT +tjT +gVq jLb jLb jLb @@ -72496,10 +72574,10 @@ aad aad jLb pHR -fCz -saY -saY -lvF +kuF +oNj +oNj +tkx pHR pHR pHR @@ -72691,10 +72769,10 @@ aad jLb kyW pHR -fCz -saY +kuF +oNj gcj -iBT +rDL pHR pHR pHR @@ -72886,9 +72964,9 @@ vPQ jLb jLb pHR -toV -drQ -iBT +wPc +qCi +rDL pHR pHR jLb @@ -85690,7 +85768,7 @@ ceQ ceQ daq oeO -bhd +wcV qcB daq daq @@ -85884,8 +85962,8 @@ ceQ ceQ daq daq -beG -bhg +tfU +oYJ daq daq sKg From 519986e0a77a063bdb3787ff77de71a7fb96538f Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:36:16 -0400 Subject: [PATCH 03/10] Update code/game/turfs/floors/desert.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/turfs/floors/desert.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/turfs/floors/desert.dm b/code/game/turfs/floors/desert.dm index b6abb281e721..afb3869619bd 100644 --- a/code/game/turfs/floors/desert.dm +++ b/code/game/turfs/floors/desert.dm @@ -144,6 +144,7 @@ /turf/open/desert/desert_shore/shore_edge1 name = "shore" icon_state = "shore_edge1" + /turf/open/desert/desert_shore/shore_edge1/can_surgery allow_construction = TRUE supports_surgery = TRUE @@ -151,6 +152,7 @@ /turf/open/desert/desert_shore/shore_corner1 name = "shore" icon_state = "shore_corner1" + /turf/open/desert/desert_shore/shore_corner1/can_surgery allow_construction = TRUE supports_surgery = TRUE @@ -158,6 +160,7 @@ /turf/open/desert/desert_shore/shore_corner2 name = "shore" icon_state = "shore_corner2" + /turf/open/desert/desert_shore/shore_corner2/can_surgery allow_construction = TRUE supports_surgery = TRUE From a8f319c7d9c3e51fd9471c74eb1862f774d0c369 Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:36:27 -0400 Subject: [PATCH 04/10] Update code/game/turfs/open.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/turfs/open.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 2d6548d1a59f..9ae69d06911d 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -468,6 +468,7 @@ baseturfs = /turf/open/gm/river supports_surgery = FALSE minimap_color = MINIMAP_WATER + /turf/open/gm/river/can_surgery allow_construction = TRUE supports_surgery = TRUE From 11d8e1c1d9a77757d7cdf6caef30bb904cc8318c Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:36:35 -0400 Subject: [PATCH 05/10] Update code/game/turfs/floors/desert.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/turfs/floors/desert.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/turfs/floors/desert.dm b/code/game/turfs/floors/desert.dm index afb3869619bd..7b8f3dde7919 100644 --- a/code/game/turfs/floors/desert.dm +++ b/code/game/turfs/floors/desert.dm @@ -255,6 +255,7 @@ /turf/open/gm/river/desert/shallow icon_state = "shallow" icon_overlay = "_shallow" + /turf/open/gm/river/desert/shallow/can_surgery allow_construction = TRUE supports_surgery = TRUE From 586ee58f964ef423d4b0d9d5eaa78111a2c366e3 Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:36:42 -0400 Subject: [PATCH 06/10] Update code/game/turfs/open.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/turfs/open.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 9ae69d06911d..36158973e19c 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -609,6 +609,7 @@ icon_state = "beach" baseturfs = /turf/open/gm/coast supports_surgery = FALSE + /turf/open/gm/coast/can_surgery allow_construction = TRUE supports_surgery = TRUE From 760a2784c16da0ac111c20d9da751cfb6052c1f0 Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:36:56 -0400 Subject: [PATCH 07/10] Update code/game/turfs/open.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/turfs/open.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 36158973e19c..7a34c0c408c4 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -644,6 +644,7 @@ /turf/open/gm/coast/beachcorner2 icon_state = "beachcorner2" + /turf/open/gm/coast/beachcorner2/can_surgery allow_construction = TRUE supports_surgery = TRUE From c73171bdaf62b83284ac14a5762f0ebe26e517a8 Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:37:23 -0400 Subject: [PATCH 08/10] Update code/game/turfs/open.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- code/game/turfs/open.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm index 7a34c0c408c4..4b36e921debd 100644 --- a/code/game/turfs/open.dm +++ b/code/game/turfs/open.dm @@ -627,6 +627,7 @@ /turf/open/gm/coast/beachcorner icon_state = "beachcorner" + /turf/open/gm/coast/beachcorner/can_surgery allow_construction = TRUE supports_surgery = TRUE From 994673fb52a830665b8d20368690aedf9096b12a Mon Sep 17 00:00:00 2001 From: hislittlecuzingames <142365554+hislittlecuzingames@users.noreply.github.com> Date: Thu, 30 May 2024 17:38:34 -0400 Subject: [PATCH 09/10] Update squad_engineer.dm --- .../machinery/vending/vendor_types/squad_prep/squad_engineer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm index c409f0cc3d1b..998b17504a44 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_engineer.dm @@ -205,7 +205,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_engi, list( /obj/item/explosive/plastic, /obj/item/stack/sandbags_empty = 25, /obj/item/stack/sheet/metal/large_stack, - /obj/item/stack/sheet/plasteel/medium_stack = 40, + /obj/item/stack/sheet/plasteel/medium_stack, /obj/item/cell/high, /obj/item/tool/shovel/etool/folded, /obj/item/device/lightreplacer, From ddb66d3563c0fd64a5edcf1990ced8b3d7c84014 Mon Sep 17 00:00:00 2001 From: hislittlecuzin Date: Wed, 19 Jun 2024 10:10:42 -0400 Subject: [PATCH 10/10] polish of changes --- maps/map_files/DesertDam/Desert_Dam.dmm | 299 +++++++++--------------- maps/map_files/Kutjevo/Kutjevo.dmm | 15 +- 2 files changed, 109 insertions(+), 205 deletions(-) diff --git a/maps/map_files/DesertDam/Desert_Dam.dmm b/maps/map_files/DesertDam/Desert_Dam.dmm index b104abb30d15..30ac65ad6e48 100644 --- a/maps/map_files/DesertDam/Desert_Dam.dmm +++ b/maps/map_files/DesertDam/Desert_Dam.dmm @@ -94,9 +94,6 @@ icon_state = "desert_transition_edge1" }, /area/desert_dam/interior/caves/east_caves) -"aar" = ( -/turf/open/gm/river/desert/deep, -/area/desert_dam/interior/caves/east_caves) "aas" = ( /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) @@ -124,18 +121,10 @@ /obj/effect/decal/sand_overlay/sand1{ dir = 4 }, -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 8 }, /area/desert_dam/interior/caves/east_caves) -"aay" = ( -/turf/open/gm/river/desert/shallow, -/area/desert_dam/interior/caves/east_caves) -"aaz" = ( -/turf/open/gm/river/desert/shallow_corner{ - dir = 4 - }, -/area/desert_dam/interior/caves/east_caves) "aaA" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal11" @@ -2952,7 +2941,7 @@ }, /area/desert_dam/interior/caves/east_caves) "ajf" = ( -/turf/open/gm/river/desert/shallow_edge, +/turf/open/gm/river/desert/shallow/can_surgery, /area/desert_dam/interior/caves/east_caves) "ajg" = ( /turf/open/asphalt/cement_sunbleached{ @@ -3086,7 +3075,7 @@ /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 }, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/desert_dam/exterior/valley/valley_crashsite) @@ -4213,11 +4202,6 @@ icon_state = "bright_clean2" }, /area/desert_dam/interior/lab_northeast/east_lab_biology) -"amJ" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 6 - }, -/area/desert_dam/interior/caves/east_caves) "amK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal2" @@ -4536,11 +4520,6 @@ icon_state = "tile" }, /area/desert_dam/interior/caves/east_caves) -"anB" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 10 - }, -/area/desert_dam/interior/caves/east_caves) "anC" = ( /obj/structure/machinery/door/poddoor/almayer/locked{ dir = 4; @@ -5233,16 +5212,16 @@ /obj/effect/decal/sand_overlay/sand1{ dir = 10 }, -/turf/open/desert/desert_shore/shore_edge1, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, /area/desert_dam/interior/caves/east_caves) "apM" = ( /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 }, -/turf/open/desert/desert_shore/shore_corner2, +/turf/open/desert/desert_shore/shore_corner2/can_surgery, /area/desert_dam/interior/caves/east_caves) "apN" = ( -/turf/open/desert/desert_shore/shore_corner2{ +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ dir = 4 }, /area/desert_dam/interior/caves/east_caves) @@ -5257,7 +5236,7 @@ /area/desert_dam/exterior/valley/valley_northwest) "apR" = ( /obj/effect/decal/sand_overlay/sand1/corner1, -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/east_caves) "apS" = ( /turf/open/floor/plating{ @@ -5396,7 +5375,7 @@ /area/desert_dam/interior/dam_interior/western_dam_cave) "aqo" = ( /obj/effect/decal/sand_overlay/sand1, -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/east_caves) "aqp" = ( /obj/effect/decal/sand_overlay/sand1{ @@ -5407,7 +5386,7 @@ }, /area/desert_dam/interior/caves/east_caves) "aqq" = ( -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/east_caves) "aqr" = ( /turf/open/desert/rock/deep/transition, @@ -5638,7 +5617,7 @@ /area/desert_dam/interior/lab_northeast/east_lab_security_armory) "aqX" = ( /obj/effect/decal/sand_overlay/sand1/corner1, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/desert_dam/interior/caves/east_caves) @@ -6109,7 +6088,7 @@ /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 8 }, -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/east_caves) "ast" = ( /obj/effect/decal/sand_overlay/sand1, @@ -7692,7 +7671,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_lobby) "awR" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 1 }, /area/desert_dam/exterior/valley/valley_crashsite) @@ -7732,7 +7711,7 @@ }, /area/desert_dam/interior/lab_northeast/east_lab_lobby) "awW" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 4 }, /area/desert_dam/exterior/valley/valley_crashsite) @@ -7813,7 +7792,7 @@ }, /area/desert_dam/exterior/valley/valley_labs) "axj" = ( -/turf/open/desert/desert_shore/shore_edge1, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, /area/desert_dam/exterior/valley/valley_crashsite) "axk" = ( /obj/structure/fence, @@ -8911,7 +8890,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aAG" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 1 }, /area/desert_dam/interior/caves/central_caves) @@ -8919,17 +8898,17 @@ /obj/effect/decal/sand_overlay/sand1/corner1{ dir = 4 }, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 4 }, /area/desert_dam/interior/caves/central_caves) "aAI" = ( -/turf/open/desert/desert_shore/shore_corner2{ +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ dir = 8 }, /area/desert_dam/interior/caves/central_caves) "aAJ" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 4 }, /area/desert_dam/interior/caves/central_caves) @@ -8954,18 +8933,8 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aAN" = ( -/turf/open/gm/river/desert/shallow_corner, -/area/desert_dam/interior/caves/central_caves) -"aAO" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 1 - }, -/area/desert_dam/interior/caves/central_caves) -"aAP" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 5 - }, -/area/desert_dam/interior/caves/central_caves) +/turf/open/gm/river/desert/shallow/can_surgery, +/area/desert_dam/interior/dam_interior/western_dam_cave) "aAQ" = ( /obj/structure/machinery/sentry_holder/colony{ dir = 1; @@ -9015,14 +8984,6 @@ dir = 10 }, /area/desert_dam/interior/lab_northeast/east_lab_east_entrance) -"aAW" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 8 - }, -/area/desert_dam/interior/caves/central_caves) -"aAX" = ( -/turf/open/gm/river/desert/deep, -/area/desert_dam/interior/caves/central_caves) "aAY" = ( /turf/open/desert/dirt{ icon_state = "dirt2" @@ -9065,23 +9026,13 @@ }, /area/desert_dam/interior/caves/central_caves) "aBe" = ( -/turf/open/desert/desert_shore/shore_edge1, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, /area/desert_dam/interior/caves/central_caves) "aBf" = ( -/turf/open/desert/desert_shore/shore_corner2, +/turf/open/desert/desert_shore/shore_corner2/can_surgery, /area/desert_dam/interior/caves/central_caves) "aBg" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 10 - }, -/area/desert_dam/interior/caves/central_caves) -"aBh" = ( -/turf/open/gm/river/desert/shallow_edge, -/area/desert_dam/interior/caves/central_caves) -"aBi" = ( -/turf/open/gm/river/desert/shallow_edge{ - dir = 6 - }, +/turf/open/gm/river/desert/shallow/can_surgery, /area/desert_dam/interior/caves/central_caves) "aBj" = ( /obj/effect/decal/sand_overlay/sand2/corner2, @@ -9262,7 +9213,7 @@ /area/desert_dam/interior/caves/temple) "aBO" = ( /obj/structure/platform_decoration/mineral/sandstone/runed, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 4 }, /area/desert_dam/interior/caves/temple) @@ -9276,7 +9227,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 4 }, -/turf/open/desert/desert_shore/shore_corner1{ +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ dir = 8 }, /area/desert_dam/interior/caves/temple) @@ -9301,7 +9252,7 @@ }, /area/desert_dam/interior/caves/temple) "aBW" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 1 }, /area/desert_dam/interior/caves/temple) @@ -9863,7 +9814,7 @@ /area/desert_dam/interior/dam_interior/east_tunnel_entrance) "aDL" = ( /obj/effect/decal/sand_overlay/sand1/corner1, -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/desert_dam/exterior/valley/valley_crashsite) @@ -11414,17 +11365,9 @@ /obj/structure/flora/grass/desert/lightgrass_8, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_crashsite) -"aIv" = ( -/turf/open/gm/river/desert/shallow, -/area/desert_dam/exterior/valley/valley_crashsite) "aIw" = ( /turf/closed/wall/r_wall/chigusa, /area/desert_dam/building/substation/northeast) -"aIx" = ( -/turf/open/desert/desert_shore/desert_shore1{ - dir = 4 - }, -/area/desert_dam/exterior/valley/valley_crashsite) "aIy" = ( /obj/effect/decal/sand_overlay/sand1/corner1, /turf/open/desert/dirt{ @@ -11473,16 +11416,6 @@ }, /turf/open/asphalt/cement_sunbleached, /area/desert_dam/exterior/valley/valley_crashsite) -"aIF" = ( -/turf/open/desert/desert_shore/shore_corner2{ - dir = 4 - }, -/area/desert_dam/exterior/valley/valley_crashsite) -"aIG" = ( -/turf/open/desert/desert_shore/shore_edge1{ - dir = 8 - }, -/area/desert_dam/exterior/valley/valley_crashsite) "aIH" = ( /obj/effect/landmark/structure_spawner/setup/distress/xeno_weed_node, /obj/effect/decal/sand_overlay/sand1/corner1, @@ -11612,9 +11545,6 @@ dir = 1 }, /area/desert_dam/exterior/valley/valley_crashsite) -"aJc" = ( -/turf/open/gm/river/desert/shallow, -/area/desert_dam/interior/caves/central_caves) "aJd" = ( /turf/closed/wall/r_wall/chigusa, /area/desert_dam/interior/lab_northeast/east_lab_lobby) @@ -11623,7 +11553,7 @@ /turf/open/floor/plating, /area/desert_dam/interior/lab_northeast/east_lab_lobby) "aJf" = ( -/turf/open/desert/desert_shore/shore_corner2{ +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ dir = 4 }, /area/desert_dam/interior/caves/central_caves) @@ -11712,12 +11642,6 @@ icon_state = "whitegreen" }, /area/desert_dam/building/lab_northwest/west_lab_xenoflora) -"aJx" = ( -/obj/effect/decal/sand_overlay/sand1/corner1{ - dir = 8 - }, -/turf/open/desert/desert_shore/shore_edge1, -/area/desert_dam/exterior/valley/valley_crashsite) "aJy" = ( /obj/effect/blocker/toxic_water/Group_2, /turf/open/gm/river/desert/deep, @@ -11738,9 +11662,6 @@ }, /turf/open/desert/dirt, /area/desert_dam/exterior/valley/valley_civilian) -"aJB" = ( -/turf/open/desert/desert_shore/desert_shore1, -/area/desert_dam/exterior/valley/valley_crashsite) "aJC" = ( /turf/open/desert/excavation/component3{ dir = 6 @@ -11765,7 +11686,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aJH" = ( -/turf/open/desert/desert_shore/shore_edge1{ +/turf/open/desert/desert_shore/shore_edge1/can_surgery{ dir = 8 }, /area/desert_dam/interior/caves/central_caves) @@ -11819,7 +11740,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aJQ" = ( -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/central_caves) "aJR" = ( /obj/effect/decal/sand_overlay/sand1{ @@ -12124,7 +12045,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "aKO" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 4 }, /area/desert_dam/interior/caves/central_caves) @@ -60382,7 +60303,7 @@ /obj/structure/platform_decoration/mineral/sandstone/runed{ dir = 8 }, -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/temple) "flj" = ( /obj/structure/filingcabinet, @@ -61392,7 +61313,7 @@ }, /area/desert_dam/exterior/valley/valley_crashsite) "ioA" = ( -/turf/open/gm/river/desert/shallow, +/turf/open/gm/river/desert/shallow/can_surgery, /area/desert_dam/interior/caves/temple) "ipQ" = ( /obj/docking_port/stationary/trijent_elevator/empty{ @@ -61550,7 +61471,7 @@ }, /area/desert_dam/interior/dam_interior/garage) "iNF" = ( -/turf/open/desert/desert_shore/shore_edge1, +/turf/open/desert/desert_shore/shore_edge1/can_surgery, /area/desert_dam/interior/caves/temple) "iOa" = ( /obj/structure/flora/grass/desert/lightgrass_2, @@ -61946,7 +61867,7 @@ /turf/open/floor/interior/wood, /area/desert_dam/building/security/detective) "ktJ" = ( -/turf/open/desert/desert_shore/desert_shore1, +/turf/open/desert/desert_shore/desert_shore1/can_surgery, /area/desert_dam/interior/caves/temple) "kzQ" = ( /obj/structure/platform{ @@ -63845,7 +63766,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_telecoms) "rbp" = ( -/turf/open/desert/desert_shore/shore_corner1{ +/turf/open/desert/desert_shore/shore_corner2/can_surgery{ dir = 1 }, /area/desert_dam/interior/caves/temple) @@ -64125,9 +64046,6 @@ name = "reinforced metal wall" }, /area/desert_dam/exterior/rock) -"rTW" = ( -/turf/open/gm/river/desert/deep, -/area/desert_dam/interior/caves/temple) "rUA" = ( /obj/structure/fence, /turf/open/desert/dirt{ @@ -64784,9 +64702,6 @@ /obj/structure/blocker/forcefield/multitile_vehicles, /turf/closed/wall/r_wall/bunker, /area/desert_dam/interior/lab_northeast/east_lab_west_entrance) -"tRT" = ( -/turf/open/gm/river/desert/deep, -/area/desert_dam/exterior/valley/valley_crashsite) "tSK" = ( /obj/structure/desertdam/decals/road_edge{ icon_state = "road_edge_decal7" @@ -64852,7 +64767,7 @@ /turf/closed/wall/mineral/sandstone/runed, /area/desert_dam/exterior/rock) "uhf" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 1 }, /area/desert_dam/interior/caves/temple) @@ -65004,7 +64919,7 @@ /obj/structure/platform/mineral/sandstone/runed{ dir = 4 }, -/turf/open/gm/river/desert/shallow, +/turf/open/gm/river/desert/shallow/can_surgery, /area/desert_dam/interior/caves/temple) "uLr" = ( /obj/structure/disposalpipe/segment{ @@ -65527,7 +65442,7 @@ /turf/open/asphalt, /area/desert_dam/exterior/valley/valley_hydro) "wyo" = ( -/turf/open/desert/desert_shore/desert_shore1{ +/turf/open/desert/desert_shore/desert_shore1/can_surgery{ dir = 8 }, /area/desert_dam/interior/caves/temple) @@ -67680,7 +67595,7 @@ dTs dTs dTs dTs -bQP +aAN bRJ bQO bQO @@ -67917,7 +67832,7 @@ dTs dTs bRK bQP -bQP +aAN bUf dTs dTs @@ -109515,7 +109430,7 @@ cov cYx dTs dTs -aJx +sGs aJM adA aGZ @@ -109749,7 +109664,7 @@ cov cYx dTs dTs -aJB +syH acZ adA adA @@ -109982,8 +109897,8 @@ aOh cov cYx dTs -aIv -aJB +rqH +syH acZ adA adA @@ -110216,8 +110131,8 @@ dTs cov cYx dTs -aIv -aJB +rqH +syH njF adA adA @@ -110450,7 +110365,7 @@ dTs cov cYx dTs -aIF +iQO aDL adr adA @@ -115400,8 +115315,8 @@ dTs dTs dTs dTs -aIv -aJB +rqH +syH agD adA axD @@ -115634,8 +115549,8 @@ dTs dTs dTs dTs -aIv -aJB +rqH +syH agD adA aBq @@ -115848,7 +115763,7 @@ dTs dTs dTs dTs -aJc +aBg aJQ aBd aKB @@ -115866,10 +115781,10 @@ dTs dTs dTs dTs -tRT -aIv -aIF -aIG +rqH +rqH +iQO +lVs agD adA adA @@ -116082,7 +115997,7 @@ dTs dTs dTs dTs -aJc +aBg aBf aBe aKd @@ -116100,9 +116015,9 @@ azT dTs dTs dTs -aIv -aIv -aJB +rqH +rqH +syH aIH aEV adA @@ -116316,7 +116231,7 @@ dTs dTs dTs dTs -aAW +aBg aBg aJQ aKd @@ -116334,9 +116249,9 @@ azT azT dTs awR -aIv -aIF -aIG +rqH +iQO +lVs agD adA adA @@ -116549,9 +116464,9 @@ dTs dTs dTs dTs -aAN -aAX -aBh +aBg +aBg +aBg aJQ aBd aKB @@ -116568,8 +116483,8 @@ azT azT azT awW -aIx -aIG +hef +lVs tKQ agD adA @@ -116782,10 +116697,10 @@ dTs aFz aAz dTs -aJc -aAO -aAX -aBh +aBg +aBg +aBg +aBg aJQ aAY aKd @@ -117016,10 +116931,10 @@ aGR aFz aAz aAG -aJc -aAO -aAX -aBh +aBg +aBg +aBg +aBg aBf aBe aKd @@ -117251,10 +117166,10 @@ aFz aAA aAH aAI -aAP -aAN -aBh -aJc +aBg +aBg +aBg +aBg aJQ aKd aFz @@ -117485,10 +117400,10 @@ aFz aFz aAz aAG -aJc -aAP -aBi -aJc +aBg +aBg +aBg +aBg aJQ aKd aFz @@ -117720,8 +117635,8 @@ aFz aAz aAJ aAI -aJc -aJc +aBg +aBg aJf aJH aKd @@ -117753,8 +117668,8 @@ dTs dTs uhf ioA -rTW -rTW +ioA +ioA ioA ktJ aBE @@ -120947,8 +120862,8 @@ dTs dTs dTs dTs -aay -aay +ajf +ajf apM aax apL @@ -121182,9 +121097,9 @@ dTs dTs dTs dTs -anB -aay -aay +ajf +ajf +ajf aqo aat aat @@ -121417,8 +121332,8 @@ dTs dTs dTs ajf -aay -aay +ajf +ajf ass atd aat @@ -121651,7 +121566,7 @@ dTs dTs dTs ajf -aay +ajf apN aqX aqY @@ -121883,9 +121798,9 @@ dTs dTs dTs dTs -aaz -amJ -aay +ajf +ajf +ajf aqq ast aat @@ -122116,9 +122031,9 @@ dTs dTs dTs dTs -aar ajf -aay +ajf +ajf apN aqX aqY @@ -122350,9 +122265,9 @@ dTs dTs dTs dTs -aar ajf -aay +ajf +ajf apR aqY asu @@ -122585,8 +122500,8 @@ dTs dTs dTs dTs -amJ -aay +ajf +ajf aqo aat aat diff --git a/maps/map_files/Kutjevo/Kutjevo.dmm b/maps/map_files/Kutjevo/Kutjevo.dmm index c03cafb824bb..35d6f42d8e46 100644 --- a/maps/map_files/Kutjevo/Kutjevo.dmm +++ b/maps/map_files/Kutjevo/Kutjevo.dmm @@ -7485,12 +7485,6 @@ "kjk" = ( /turf/open/floor/kutjevo/grey/plate, /area/kutjevo/interior/colony_central) -"kjo" = ( -/obj/structure/flora/bush/ausbushes/reedbush, -/turf/open/desert/desert_shore/desert_shore1{ - dir = 4 - }, -/area/kutjevo/exterior/scrubland) "kkB" = ( /obj/structure/machinery/vending/cigarette/colony, /turf/open/floor/kutjevo/colors/cyan, @@ -12834,11 +12828,6 @@ dir = 4 }, /area/kutjevo/interior/colony_South/power2) -"rsV" = ( -/turf/open/desert/desert_shore/desert_shore1{ - dir = 8 - }, -/area/kutjevo/exterior/scrubland) "rte" = ( /obj/structure/prop/dam/boulder/boulder2, /turf/open/auto_turf/sand/layer0, @@ -23082,7 +23071,7 @@ dxF dxF dxF mbh -rsV +uMg xYt dxF tlN @@ -23416,7 +23405,7 @@ dxF dxF dxF gxs -kjo +bMo umQ bXl fFH