2nd Battlegroup/ACLF to NGR outfit updates (#2704)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

Repaths various clothing items from the ACLF Grunt and 2nd Battlegroup
Captain outfits to more appropriately reflect their connection to the
New Gorlex Republic.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game

local lorema DEMANDS lore compliance, dozens wounded

## Changelog

:cl:
tweak: Tweaked Syndicate Grunt/Captain clothing descriptions for lore
compliance
refactor: changed paths for ACLF Grunt and 2nd Battlegroup outfit parts
fix: 2nd Battlegroup captain jacket can now hold firearms
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -4117,10 +4117,10 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "Co" = (
 /obj/structure/closet,
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
 /turf/open/floor/plating{
 	icon_state = "platingdmg2"
 	},
@@ -5382,7 +5382,7 @@
 	},
 /area/overmap_encounter/planetoid/jungle/explored)
 "Kx" = (
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
 /turf/open/floor/plating{
 	icon_state = "platingdmg3"
 	},
@@ -5611,8 +5611,8 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/gorlex,
-/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7295,8 +7295,8 @@
 "XC" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/officer,
-/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/ngr/officer,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
 /obj/item/clothing/shoes/combat,
 /turf/open/floor/mineral/plastitanium,
 /area/ruin/jungle/starport/tower)

_maps/shuttles/syndicate/syndicate_aegis.dmm

@@ -33,7 +33,7 @@
 /obj/item/clothing/head/HoS/beret/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
-/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/clothing/under/syndicate/combat,
 /obj/item/clothing/glasses/hud/security/sunglasses,
 /obj/item/clothing/neck/stripedredscarf,

_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm

@@ -3830,20 +3830,20 @@
 	req_access_txt = "20"
 	},
 /obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/gloves/krav_maga/combatglovesplus,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/glasses/thermal/eyepatch,
 /obj/item/clothing/head/HoS/beret/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
-/obj/item/clothing/head/gorlexcap{
+/obj/item/clothing/head/ngrcap{
 	pixel_x = 5;
 	pixel_y = -4
 	},
 /obj/item/gun/ballistic/derringer/traitor,
 /obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/radio/headset/syndicate/alt/leader,
@@ -3976,7 +3976,7 @@
 	pixel_y = 7
 	},
 /obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
 /obj/item/clothing/shoes/combat,
 /obj/item/clothing/mask/gas/syndicate,
 /obj/item/clothing/suit/armor/vest/duster,
@@ -4798,7 +4798,7 @@
 /obj/item/ammo_box/magazine/m45{
 	pixel_x = 3
 	},
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
 /obj/item/clothing/gloves/tackler/combat/insulated,
 /obj/item/clothing/suit/armor/vest/leather{
 	desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders."

_maps/shuttles/syndicate/syndicate_twinkleshine.dmm

@@ -514,7 +514,7 @@
 	req_access = list(151)
 	},
 /obj/item/areaeditor/shuttle,
-/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/under/syndicate/ngr/officer,
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
 /obj/item/codespeak_manual/unlimited,
@@ -4072,8 +4072,8 @@
 	pixel_x = -28;
 	name = "uniform closet"
 	},
-/obj/item/clothing/under/syndicate/aclfgrunt,
-/obj/item/clothing/under/syndicate/aclfgrunt,
+/obj/item/clothing/under/syndicate/ngr,
+/obj/item/clothing/under/syndicate/ngr,
 /obj/item/clothing/under/syndicate/skirt,
 /obj/item/clothing/under/syndicate/skirt,
 /obj/item/clothing/under/syndicate/skirt,
@@ -5343,9 +5343,9 @@
 /obj/effect/turf_decal/spline/fancy/opaque/syndiered{
 	dir = 5
 	},
-/obj/item/clothing/head/gorlexcap,
-/obj/item/clothing/suit/gorlex,
-/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/head/ngrcap,
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
+/obj/item/clothing/under/syndicate/ngr/officer,
 /obj/structure/closet/secure_closet{
 	anchored = 1;
 	icon_state = "syndicate";

code/modules/clothing/head/misc.dm

@@ -466,11 +466,11 @@
 	icon_state = "JackFrostHat"
 	item_state = "JackFrostHat"
 
-/obj/item/clothing/head/gorlexcap
+/obj/item/clothing/head/ngrcap
 	name = "2nd Battlegroup peaked cap"
-	desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup."
-	icon_state = "gorlexcap"
-	item_state = "gorlexcap"
+	desc = "A cap worn by officers of the New Gorlex Republic's 2nd Battlegroup."
+	icon_state = "ngrcap"
+	item_state = "ngrcap"
 	flags_inv = 0
 	armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	strip_delay = 60

code/modules/clothing/outfits/ert/syndicate_ert.dm

@@ -160,7 +160,7 @@
 	jobtype = /datum/job/head_of_personnel
 	job_icon = "syndicate"
 
-	uniform = /obj/item/clothing/under/syndicate/officer
+	uniform = /obj/item/clothing/under/syndicate/ngr/officer
 	head = /obj/item/clothing/head/HoS/beret/syndicate
 	mask = null
 	belt = /obj/item/clipboard

code/modules/clothing/outfits/factions/syndicate.dm

@@ -250,7 +250,7 @@
 
 	id = /obj/item/card/id/syndicate_command/captain_id
 	ears = /obj/item/radio/headset/syndicate/alt/captain
-	uniform = /obj/item/clothing/under/syndicate/officer
+	uniform = /obj/item/clothing/under/syndicate/ngr/officer
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/HoS/syndicate
 	gloves = /obj/item/clothing/gloves/combat
@@ -270,7 +270,7 @@
 /datum/outfit/job/syndicate/captain/twink
 	name = "Syndicate - Captain (Twinkleshine)"
 
-	uniform = /obj/item/clothing/under/syndicate/officer
+	uniform = /obj/item/clothing/under/syndicate/ngr/officer
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat
 	ears = /obj/item/radio/headset/syndicate/alt/captain
@@ -291,10 +291,10 @@
 
 /datum/outfit/job/syndicate/captain/gorlex
 	name = "Syndicate - Captain (Gorlex Marauders)"
-	uniform = /obj/item/clothing/under/syndicate/officer
+	uniform = /obj/item/clothing/under/syndicate/ngr/officer
 
-	head = /obj/item/clothing/head/gorlexcap
-	suit = /obj/item/clothing/suit/gorlex
+	head = /obj/item/clothing/head/ngrcap
+	suit = /obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain
 
 /datum/outfit/job/syndicate/captain/cybersun
 	name = "Syndicate - Captain (Cybersun)"
@@ -462,7 +462,7 @@
 	job_icon = "headofpersonnel"
 
 	ears = /obj/item/radio/headset/syndicate/alt
-	uniform = /obj/item/clothing/under/syndicate/aclfgrunt
+	uniform = /obj/item/clothing/under/syndicate/ngr
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/HoS/beret/syndicate
 	gloves = /obj/item/clothing/gloves/color/white
@@ -528,7 +528,7 @@
 /datum/outfit/job/syndicate/hos/twink
 	name = "Syndicate - Lieutenant (Twinkleshine)"
 
-	uniform = /obj/item/clothing/under/syndicate/officer
+	uniform = /obj/item/clothing/under/syndicate/ngr/officer
 	head = /obj/item/clothing/head/HoS/beret/syndicate
 	ears = /obj/item/radio/headset/syndicate/alt
 	mask = /obj/item/clothing/mask/chameleon
@@ -538,7 +538,7 @@
 	belt = /obj/item/storage/belt/military/assault
 	shoes = /obj/item/clothing/shoes/combat
 	suit = /obj/item/clothing/suit/armor/vest
-	alt_suit = /obj/item/clothing/suit/gorlex
+	alt_suit = /obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain
 	id = /obj/item/card/id/syndicate_command/lieutenant
 	implants = list(/obj/item/implant/weapons_auth)
 	backpack_contents = list(/obj/item/melee/baton)
@@ -932,7 +932,7 @@
 	job_icon = "stationengineer"
 
 	id = /obj/item/card/id/syndicate_command/crew_id
-	uniform = /obj/item/clothing/under/syndicate/aclfgrunt
+	uniform = /obj/item/clothing/under/syndicate/ngr
 	accessory = /obj/item/clothing/accessory/armband/engine
 	glasses = /obj/item/clothing/glasses/sunglasses
 	shoes = /obj/item/clothing/shoes/jackboots

code/modules/clothing/suits/armor.dm

@@ -150,7 +150,16 @@
 /obj/item/clothing/suit/armor/vest/capcarapace/cybersun
 	name = "Cybersun captain's haori"
 	desc = "An extraordinarily fashionable haori, utilized by Cybersun captains. Weaved with armored fabric to protect the user from gunshots."
-	icon_state = "cybersunhaori"
+	icon_state = "carapace_cybersun"
+
+/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain
+	name = "\improper 2nd Battlegroup jacket"
+	desc = "An armored jacket worn by the New Gorlex Republic's 2nd Battlegroup."
+	body_parts_covered = CHEST|GROIN|ARMS|HANDS
+	icon_state = "carapace_ngr"
+	item_state = "carapace_ngr"
+	blood_overlay_type = "coat"
+	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 
 /obj/item/clothing/suit/armor/vest/capcarapace/alt
 	name = "captain's parade jacket"

code/modules/clothing/suits/miscellaneous.dm

@@ -685,12 +685,3 @@
 	icon_state = "DutchJacket"
 	item_state = "DutchJacket"
 	body_parts_covered = ARMS
-
-/obj/item/clothing/suit/gorlex
-	name = "\improper 2nd Battlegroup jacket"
-	desc = "An armored jacket worn by the 2nd Battlegroup."
-	body_parts_covered = CHEST|GROIN|ARMS|HANDS
-	icon_state = "gorlexjacket"
-	item_state = "gorlexjacket"
-	blood_overlay_type = "coat"
-	armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)

code/modules/clothing/under/syndicate.dm

@@ -93,18 +93,18 @@
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/syndicate/officer
-	name = "syndicate officer uniform"
-	desc = "A black uniform worn by officers of many branches of the Syndicate."
-	icon_state = "officer"
+/obj/item/clothing/under/syndicate/ngr/officer
+	name = "NGR officer uniform"
+	desc = "A black uniform worn by officers of the New Gorlex Republic."
+	icon_state = "ngr_officer"
 	can_adjust = FALSE
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
 	alt_covers_chest = TRUE
 
-/obj/item/clothing/under/syndicate/aclfgrunt
-	name = "ACLF uniform"
-	desc = "A button-up in a tasteful shade of gray with red pants, used as the uniform of the Anti-Corporate Liberation front on the rim."
-	icon_state = "aclfgrunt"
+/obj/item/clothing/under/syndicate/ngr
+	name = "NGR uniform"
+	desc = "A button-up in a tasteful shade of gray with red pants, used as the basic uniform of the New Gorlex Republic."
+	icon_state = "ngr_grunt"
 	can_adjust = FALSE
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
 	alt_covers_chest = TRUE