Merge branch 'master' into legion-rework

shiptest-ss13 · Mar 4, 2024 · 2d1361a · 2d1361a
2 parents 8fdb556 + 6f6cade
commit 2d1361a
Show file tree

Hide file tree

Showing 304 changed files with 13,639 additions and 46,535 deletions.
diff --git a/2024-02-11 19 b/2024-02-11 19
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" = (