From 1409761407bfe9e6b88083a8edab261976210816 Mon Sep 17 00:00:00 2001 From: Sadhorizon <108196626+Sadhorizon@users.noreply.github.com> Date: Fri, 19 Apr 2024 16:34:28 +0200 Subject: [PATCH] Adds NGR outfits to the Hyena. (#2896) ## 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 ## Why It's Good For The Game It's hard to enforce uniform policy without uniforms present! ## Changelog :cl: tweak: Replaced standard syndicate outfits with NGR outfits on the Hyena. add: Added NGR-specific CE and Assistant outfits. /:cl: --- _maps/configs/syndicate_gorlex_hyena.json | 4 ++-- .../syndicate/syndicate_gorlex_hyena.dmm | 20 ++++++++----------- .../clothing/outfits/factions/syndicate.dm | 12 +++++++++++ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index 51b046d114b79..7b72cf208e0d0 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -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 }, @@ -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 } }, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index f573148a8fe4d..93600539c4b46 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -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, @@ -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, @@ -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{ diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 44199ac361a38..8f98f29a6b1fd 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -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" @@ -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 @@ -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