Skip to content

Commit

Permalink
Adds NGR outfits to the Hyena. (shiptest-ss13#2896)
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
- Added NGR outfits to the dorms locker
- replaced syndicate clothing in captain's locker with NGR clothing.
- gave the foreman an NGR officer outfit
- assistants now have NGR outfits

<!-- 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
It's hard to enforce uniform policy without uniforms present!

<!-- 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: Replaced standard syndicate outfits with NGR outfits on the
Hyena.
add: Added NGR-specific CE and Assistant outfits.
/: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
Sadhorizon authored and MysticalFaceLesS committed Apr 28, 2024
1 parent ec30fbb commit b5e4f78
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 14 deletions.
4 changes: 2 additions & 2 deletions _maps/configs/syndicate_gorlex_hyena.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"slots": 1
},
"Foreman": {
"outfit": "/datum/outfit/job/syndicate/ce/gorlex",
"outfit": "/datum/outfit/job/syndicate/ce/gorlex/ngr",
"officer": true,
"slots": 1
},
Expand All @@ -36,7 +36,7 @@
"slots": 2
},
"Junior Agent": {
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex",
"outfit": "/datum/outfit/job/syndicate/assistant/gorlex/ngr",
"slots": 2
}
},
Expand Down
20 changes: 8 additions & 12 deletions _maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -55,12 +55,12 @@
req_access = list(20)
},
/obj/item/storage/backpack/security,
/obj/item/clothing/under/syndicate/combat,
/obj/item/clothing/suit/armor/vest/capcarapace/syndicate,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/gloves/combat,
/obj/item/clothing/glasses/hud/security/sunglasses/eyepatch,
/obj/item/clothing/head/HoS/syndicate,
/obj/item/clothing/head/ngrcap,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/gun/ballistic/revolver,
/obj/item/ammo_box/a357/match,
Expand Down Expand Up @@ -1497,14 +1497,10 @@
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate/skirt,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/under/syndicate/ngr,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
/obj/item/clothing/head/soft/black,
Expand Down Expand Up @@ -1647,7 +1643,7 @@
req_access = list(56)
},
/obj/item/clothing/shoes/jackboots,
/obj/item/clothing/under/syndicate/gorlex,
/obj/item/clothing/under/syndicate/ngr/officer,
/obj/item/clothing/suit/toggle/industrial,
/obj/item/clothing/gloves/combat,
/obj/item/storage/belt/utility/chief{
Expand Down
12 changes: 12 additions & 0 deletions code/modules/clothing/outfits/factions/syndicate.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,12 @@
uniform = /obj/item/clothing/under/syndicate/gorlex
alt_uniform = /obj/item/clothing/under/syndicate

/datum/outfit/job/syndicate/assistant/gorlex/ngr
name = "Syndicate - Junior Agent (New Gorlex Republic)"

uniform = /obj/item/clothing/under/syndicate/ngr
alt_uniform = null

/datum/outfit/job/syndicate/assistant/gec
name = "Syndicate - Deckhand (GEC)"
id_assignment = "Deckhand"
Expand Down Expand Up @@ -421,6 +427,11 @@
shoes = /obj/item/clothing/shoes/jackboots
gloves = /obj/item/clothing/gloves/combat

/datum/outfit/job/syndicate/ce/gorlex/ngr
name = "Syndicate - Foreman (New Gorlex Republic)"

uniform = /obj/item/clothing/under/syndicate/ngr/officer

//Chief Medical Officer

/datum/outfit/job/syndicate/cmo
Expand Down Expand Up @@ -918,6 +929,7 @@
id_assignment = "Wrecker"

uniform = /obj/item/clothing/under/syndicate/gorlex
accessory = /obj/item/clothing/accessory/armband/cargo
shoes = /obj/item/clothing/shoes/workboots
ears = /obj/item/radio/headset/alt

Expand Down

0 comments on commit b5e4f78

Please sign in to comment.