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

shiptest-ss13 · May 23, 2024 · eaff52b · eaff52b
2 parents 38629df + 48f28b3
commit eaff52b
Show file tree

Hide file tree

Showing 243 changed files with 27,445 additions and 29,482 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" = (

diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
@@ -5611,7 +5611,7 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7296,7 +7296,7 @@
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
 /obj/item/clothing/under/syndicate/ngr/officer,
-/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/clothing/suit/armor/ngr/captain,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)