Merge pull request #199 from Mirag1993/Мердж-с-оффами

Changes the description and path of the Gorlex uniforms (shiptest-ss13#2497)

_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm

@@ -5624,8 +5624,8 @@
 /area/overmap_encounter/planetoid/jungle/explored)
 "LM" = (
 /obj/structure/closet,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/officer,
 /obj/item/gun/ballistic/automatic/pistol,
 /obj/item/ammo_box/magazine/m10mm,
 /obj/item/ammo_box/magazine/m10mm,
@@ -7308,8 +7308,8 @@
 "XC" = (
 /obj/effect/decal/remains/human,
 /obj/effect/decal/cleanable/vomit/old,
-/obj/item/clothing/under/syndicate/aclf,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/gorlex,
 /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/aclf,
+/obj/item/clothing/under/syndicate/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

@@ -3145,20 +3145,23 @@
 	req_access_txt = "20"
 	},
 /obj/item/clothing/under/syndicate/combat,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
+/obj/item/clothing/suit/armor/vest/security/hos{
+	name = "Syndicate jacket"
+	},
 /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/aclfcap{
+/obj/item/clothing/head/gorlexcap{
 	pixel_x = 5;
 	pixel_y = -4
 	},
 /obj/item/gun/ballistic/derringer/traitor,
 /obj/item/clothing/under/syndicate/sniper,
-/obj/item/clothing/suit/aclf,
+/obj/item/clothing/suit/gorlex,
 /obj/item/ammo_box/a357,
 /obj/item/ammo_box/a357,
 /obj/item/radio/headset/syndicate/alt/leader,

_maps/shuttles/syndicate/syndicate_twinkleshine.dmm

@@ -514,7 +514,7 @@
 	req_access = list(151)
 	},
 /obj/item/areaeditor/shuttle,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/under/syndicate/officer,
 /obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
 /obj/item/clothing/head/HoS/syndicate,
 /obj/item/codespeak_manual/unlimited,
@@ -5364,9 +5364,9 @@
 /obj/effect/turf_decal/spline/fancy/opaque/syndiered{
 	dir = 5
 	},
-/obj/item/clothing/head/aclfcap,
-/obj/item/clothing/suit/aclf,
-/obj/item/clothing/under/syndicate/aclf,
+/obj/item/clothing/head/gorlexcap,
+/obj/item/clothing/suit/gorlex,
+/obj/item/clothing/under/syndicate/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/aclfcap
+/obj/item/clothing/head/gorlexcap
 	name = "2nd Battlegroup peaked cap"
-	desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup, or as they say, the ACLF."
-	icon_state = "aclfcap"
-	item_state = "aclfcap"
+	desc = "A cap worn by officers of the Gorlex Marauders 2nd Battlegroup."
+	icon_state = "gorlexcap"
+	item_state = "gorlexcap"
 	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/syndicate.dm

@@ -211,7 +211,7 @@
 
 	id = /obj/item/card/id/syndicate_command/captain_id
 	ears = /obj/item/radio/headset/syndicate/alt/captain
-	uniform = /obj/item/clothing/under/syndicate/aclf
+	uniform = /obj/item/clothing/under/syndicate/officer
 	shoes = /obj/item/clothing/shoes/jackboots
 	head = /obj/item/clothing/head/HoS/syndicate
 	gloves = /obj/item/clothing/gloves/combat
@@ -232,7 +232,7 @@
 /datum/outfit/job/syndicate/captain/twink
 	name = "Captain (Twinkleshine)"
 
-	uniform = /obj/item/clothing/under/syndicate/aclf
+	uniform = /obj/item/clothing/under/syndicate/officer
 	gloves = /obj/item/clothing/gloves/combat
 	shoes = /obj/item/clothing/shoes/combat
 	ears = /obj/item/radio/headset/syndicate/alt/captain
@@ -253,10 +253,10 @@
 
 /datum/outfit/job/syndicate/captain/gorlex
 	name = "Captain (Gorlex Marauders)"
-	uniform = /obj/item/clothing/under/syndicate/aclf
+	uniform = /obj/item/clothing/under/syndicate/officer
 
-	head = /obj/item/clothing/head/aclfcap
-	suit = /obj/item/clothing/suit/aclf
+	head = /obj/item/clothing/head/gorlexcap
+	suit = /obj/item/clothing/suit/gorlex
 
 /datum/outfit/job/syndicate/captain/cybersun
 	name = "Captain (Cybersun)"
@@ -438,7 +438,8 @@
 
 /datum/outfit/job/syndicate/hos/twink
 	name = "Lieutenant (Twinkleshine)"
-	uniform = /obj/item/clothing/under/syndicate/aclf
+
+	uniform = /obj/item/clothing/under/syndicate/officer
 	head = /obj/item/clothing/head/HoS/beret/syndicate
 	ears = /obj/item/radio/headset/syndicate/alt
 	mask = /obj/item/clothing/mask/chameleon
@@ -448,7 +449,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/aclf
+	alt_suit = /obj/item/clothing/suit/gorlex
 	id = /obj/item/card/id/syndicate_command/lieutenant
 	implants = list(/obj/item/implant/weapons_auth)
 	backpack_contents = list(/obj/item/melee/baton)

code/modules/clothing/suits/miscellaneous.dm

@@ -686,11 +686,11 @@
 	item_state = "DutchJacket"
 	body_parts_covered = ARMS
 
-/obj/item/clothing/suit/aclf
+/obj/item/clothing/suit/gorlex
 	name = "\improper 2nd Battlegroup jacket"
-	desc = "An armored jacket worn by the Gorlex Marauders 2nd Battlegroup."
+	desc = "An armored jacket worn by the 2nd Battlegroup."
 	body_parts_covered = CHEST|GROIN|ARMS|HANDS
-	icon_state = "aclfjacket"
-	item_state = "aclfjacket"
+	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

@@ -92,10 +92,10 @@
 	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/aclf
-	name = "2nd Battlegroup uniform"
-	desc = "A black uniform worn by the officers of the Gorlex Marauders 2nd Battlegroup."
-	icon_state = "aclf"
+/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"
 	armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
 	alt_covers_chest = TRUE