Merge branch 'master' into e40

shiptest-ss13 · Oct 16, 2024 · ca9fba0 · ca9fba0
2 parents f852665 + 0437333
commit ca9fba0
Show file tree

Hide file tree

Showing 160 changed files with 7,442 additions and 3,400 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm b/_maps/RandomRuins/BeachRuins/beach_ocean_town.dmm
@@ -1698,10 +1698,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/ruin/beach/oceantown/shop)
-"ww" = (
-/obj/structure/statue/sandstone/assistant,
-/turf/open/floor/plating/asteroid/sand/lit,
-/area/overmap_encounter/planetoid/beachplanet/explored)
 "wF" = (
 /obj/structure/flora/ausbushes/fullgrass,
 /obj/structure/flora/ausbushes/brflowers,
@@ -7687,7 +7683,7 @@ sa
 sa
 Ud
 sa
-ww
+sa
 sa
 Ud
 sa