Merge branch 'master' into rockruinsnew

shiptest-ss13 · Mar 6, 2024 · 6f1c967 · 6f1c967
2 parents 7c9f324 + 66e0e3e
commit 6f1c967
Show file tree

Hide file tree

Showing 150 changed files with 9,369 additions and 47,177 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_drakelair.dmm
@@ -411,7 +411,6 @@
 "FF" = (
 /obj/structure/bed/pod,
 /obj/item/flashlight/flare/torch,
-/obj/effect/landmark/ashdrake_ghost_spawn,
 /turf/open/floor/plasteel/rockvault/sandstone,
 /area/ruin/powered)
 "Gb" = (