Merge branch 'master' into awful

shiptest-ss13 · May 22, 2024 · 61a7711 · 61a7711
2 parents 97be383 + 48f28b3
commit 61a7711
Show file tree

Hide file tree

Showing 157 changed files with 26,835 additions and 28,256 deletions.
diff --git a/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm b/_maps/RandomRuins/IceRuins/icemoon_underground_abandoned_village.dmm
@@ -101,9 +101,6 @@
 "la" = (
 /obj/effect/decal/cleanable/blood/gibs/up,
 /obj/effect/mob_spawn/human/corpse/assistant,
-/mob/living/simple_animal/hostile/skeleton/eskimo{
-	name = "Village Hunter"
-	},
 /turf/open/floor/plating/asteroid/snow/icemoon,
 /area/overmap_encounter/planetoid/cave/explored)
 "lg" = (