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

shiptest-ss13 · May 19, 2024 · 0ed17e4 · 0ed17e4
2 parents 57aa308 + 3b2b6da
commit 0ed17e4
Show file tree

Hide file tree

Showing 133 changed files with 1,077 additions and 1,423 deletions.
diff --git a/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm b/_maps/RandomRuins/BeachRuins/beach_float_resort.dmm
@@ -237,14 +237,6 @@
 	light_range = 2
 	},
 /area/ruin/beach/float_resort/villa)
-"gr" = (
-/obj/structure/table/wood,
-/obj/structure/curtain/cloth,
-/obj/item/nullrod/tribal_knife,
-/turf/open/floor/wood{
-	light_range = 2
-	},
-/area/ruin/beach/float_resort/villa)
 "gQ" = (
 /obj/structure/flora/ausbushes/genericbush,
 /turf/open/floor/plating/grass/beach,
@@ -2502,7 +2494,7 @@ kp
 kp
 kp
 kp
-gr
+ar
 OH
 OH
 OH

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)