Merge remote-tracking branch 'upstream/master' into harddel-test-thing

shiptest-ss13 · Sep 13, 2023 · 1d1d5f4 · 1d1d5f4
2 parents c9d1a40 + 1a12dce
commit 1d1d5f4
Show file tree

Hide file tree

Showing 783 changed files with 39,603 additions and 36,006 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm b/_maps/RandomRuins/BeachRuins/beach_fishing_hut.dmm
diff --git a/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm b/_maps/RandomRuins/BeachRuins/beach_treasure_cove.dmm
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,