Skip to content

Commit

Permalink
Changes the description and path of the Gorlex uniforms (#2497)
Browse files Browse the repository at this point in the history
<!-- 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

contrary to popular belief the gorlex 2nd battlegroup is not part of
the/the ACLF

<!-- 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

lore compliant

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: The 2nd Battlegroup officer uniform is now the Syndicate Officer
uniform
tweak: The 2nd Battlegroup officer jacket and cap have been updated to
reflect not being part of the ACLF
/: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. -->
  • Loading branch information
meemofcourse authored Dec 6, 2023
1 parent b84357e commit 0e374e9
Show file tree
Hide file tree
Showing 14 changed files with 35 additions and 31 deletions.
8 changes: 4 additions & 4 deletions _maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/syndicate/syndicate_aegis.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
9 changes: 6 additions & 3 deletions _maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/syndicate/syndicate_twinkleshine.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -5349,9 +5349,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";
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions code/modules/clothing/outfits/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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)"
Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions code/modules/clothing/suits/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
8 changes: 4 additions & 4 deletions code/modules/clothing/under/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/syndicate.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/syndicate.dmi
Binary file not shown.

0 comments on commit 0e374e9

Please sign in to comment.