Merge branch 'master' into blastdoors

shiptest-ss13 · May 19, 2024 · ae8097c · ae8097c
2 parents e452ca7 + 9e629b3
commit ae8097c
Show file tree

Hide file tree

Showing 115 changed files with 899 additions and 1,349 deletions.
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)