Merge remote-tracking branch 'upstream/master' into guestbook

shiptest-ss13 · Mar 4, 2024 · aecef4f · aecef4f
2 parents 520fd87 + 2acf687
commit aecef4f
Show file tree

Hide file tree

Showing 173 changed files with 11,507 additions and 44,746 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" = (