Skip to content

Commit

Permalink
hyena_outfits
Browse files Browse the repository at this point in the history
  • Loading branch information
Sadhorizon committed Apr 14, 2024
1 parent 6ff0b69 commit 26b4376
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 15 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/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 @@ -1499,14 +1499,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 @@ -1651,7 +1647,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
15 changes: 14 additions & 1 deletion 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 @@ -912,12 +923,14 @@
/obj/item/kitchen/knife/combat/survival=1,\
/obj/item/mining_voucher=1,\
/obj/item/stack/marker_beacon/ten=1)
box = /obj/item/storage/box/survival/syndie

/datum/outfit/job/syndicate/miner/gorlex
name = "Syndicate - Wrecker (Gorlex Marauders)"
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 Expand Up @@ -990,7 +1003,7 @@
head = /obj/item/clothing/head/hardhat/dblue
r_pocket = /obj/item/t_scanner

box = /obj/item/storage/box/survival/engineer
box = /obj/item/storage/box/survival/syndie
pda_slot = ITEM_SLOT_LPOCKET
backpack_contents = list(/obj/item/modular_computer/tablet/preset/advanced=1)

Expand Down

0 comments on commit 26b4376

Please sign in to comment.