Merge branch 'master' into sands-ruin

shiptest-ss13 · Sep 14, 2023 · 613ca2c · 613ca2c
2 parents dc7980b + 73d8c8b
commit 613ca2c
Show file tree

Hide file tree

Showing 198 changed files with 6,517 additions and 3,126 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -293,7 +293,7 @@
 	},
 /area/ruin/powered)
 "wX" = (
-/turf/closed/indestructible/rock/snow/ice/ore,
+/turf/closed/indestructible/rock/snow,
 /area/overmap_encounter/planetoid/cave/explored)
 "xo" = (
 /obj/structure/stone_tile/slab,

diff --git a/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm b/_maps/RandomRuins/SpaceRuins/provinggrounds.dmm
@@ -17,7 +17,7 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/ruin/space/has_grav/syndicircle/halls)
 "aW" = (
-/turf/closed/indestructible/rock/snow/ice/ore,
+/turf/closed/indestructible/rock/snow,
 /area/ruin/space/has_grav/syndicircle/winter)
 "ba" = (
 /obj/structure/filingcabinet/chestdrawer,