From de1250ab4261ff5edb33270ca1e74884043ca9af Mon Sep 17 00:00:00 2001 From: Daniel Lenrd Date: Tue, 3 Sep 2024 22:02:33 +0900 Subject: [PATCH] Adds and Adjusts Loadout Items (#26441) * Give Paramedic a medical beret * Change path of Wardens' beret * Give HOS and Warden loadout berets * removes Barber from Service Armbands * Gives Captain Procedure Armband They are technically a Head of Procedure * Gives Explorer Cargo Armband * Gives Geneticist Research and Medical berets * Gives Geneticist Research and Medical armbands * Gives Virologist Medical armband * Gives Detective Security beret * Gives Shaft Miner Cargo beret * Gives Explorer Cargo beret * Gives Geneticist Research and Medical winter coats * Gives CMO EMT armband they can have EMT labcoat, they are trained professional, why not? * Gives Geneticist Research and Medical bomber jackets --- .../objects/items/weapons/storage/garment.dm | 2 +- .../preference/loadout/loadout_accessories.dm | 12 ++++++------ .../client/preference/loadout/loadout_hat.dm | 18 ++++++++++++++---- .../client/preference/loadout/loadout_suit.dm | 8 ++++---- code/modules/clothing/head/beret.dm | 2 +- .../supply/supply_packs/pack_security.dm | 2 +- 6 files changed, 27 insertions(+), 17 deletions(-) diff --git a/code/game/objects/items/weapons/storage/garment.dm b/code/game/objects/items/weapons/storage/garment.dm index 3c31d657e18..b931ea2a76c 100644 --- a/code/game/objects/items/weapons/storage/garment.dm +++ b/code/game/objects/items/weapons/storage/garment.dm @@ -222,7 +222,7 @@ new /obj/item/clothing/suit/armor/vest/warden(src) new /obj/item/clothing/head/warden(src) new /obj/item/clothing/suit/armor/vest/warden/alt(src) - new /obj/item/clothing/head/beret/sec/warden(src) + new /obj/item/clothing/head/beret/warden(src) new /obj/item/clothing/under/rank/security/warden(src) new /obj/item/clothing/under/rank/security/formal/warden(src) new /obj/item/clothing/under/rank/security/warden/corporate(src) diff --git a/code/modules/client/preference/loadout/loadout_accessories.dm b/code/modules/client/preference/loadout/loadout_accessories.dm index 7bcd626a043..10cb910c97a 100644 --- a/code/modules/client/preference/loadout/loadout_accessories.dm +++ b/code/modules/client/preference/loadout/loadout_accessories.dm @@ -203,17 +203,17 @@ /datum/gear/accessory/armband_job/cargo display_name = "Armband, cargo" path = /obj/item/clothing/accessory/armband/cargo - allowed_roles = list("Quartermaster","Cargo Technician", "Shaft Miner") + allowed_roles = list("Quartermaster","Cargo Technician", "Shaft Miner", "Explorer") /datum/gear/accessory/armband_job/medical display_name = "Armband, medical" path = /obj/item/clothing/accessory/armband/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Paramedic") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Coroner", "Virologist", "Geneticist", "Paramedic") /datum/gear/accessory/armband_job/emt display_name = "Armband, EMT" path = /obj/item/clothing/accessory/armband/medgreen - allowed_roles = list("Paramedic") + allowed_roles = list("Chief Medical Officer", "Paramedic") /datum/gear/accessory/armband_job/engineering display_name = "Armband, engineering" @@ -228,14 +228,14 @@ /datum/gear/accessory/armband_job/sci display_name = "Armband, science" path = /obj/item/clothing/accessory/armband/science - allowed_roles = list("Research Director","Scientist", "Roboticist") + allowed_roles = list("Research Director","Scientist", "Roboticist", "Geneticist") /datum/gear/accessory/armband_job/procedure display_name = "Armband, procedure" path = /obj/item/clothing/accessory/armband/procedure - allowed_roles = list("Nanotrasen Representative", "Magistrate", "Internal Affairs Agent") + allowed_roles = list("Captain", "Nanotrasen Representative", "Magistrate", "Internal Affairs Agent") /datum/gear/accessory/armband_job/service display_name = "Armband, service" path = /obj/item/clothing/accessory/armband/service - allowed_roles = list("Head of Personnel", "Chaplain", "Janitor", "Botanist", "Chef", "Bartender", "Clown", "Mime", "Librarian", "Barber") + allowed_roles = list("Head of Personnel", "Chaplain", "Janitor", "Botanist", "Chef", "Bartender", "Clown", "Mime", "Librarian") diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm index f961117fa88..325e37e5995 100644 --- a/code/modules/client/preference/loadout/loadout_hat.dm +++ b/code/modules/client/preference/loadout/loadout_hat.dm @@ -185,7 +185,17 @@ /datum/gear/hat/beret_job/sec display_name = "Beret, security" path = /obj/item/clothing/head/beret/sec - allowed_roles = list("Head of Security", "Warden", "Security Officer") + allowed_roles = list("Head of Security", "Warden", "Security Officer", "Detective") + +/datum/gear/hat/beret_job/warden + display_name = "Beret, warden" + path = /obj/item/clothing/head/beret/warden + allowed_roles = list("Warden") + +/datum/gear/hat/beret_job/hos + display_name = "Beret, head of security" + path = /obj/item/clothing/head/beret/hos + allowed_roles = list("Head of Security") /datum/gear/hat/beret_job/jani display_name = "Beret, janitor" @@ -200,7 +210,7 @@ /datum/gear/hat/beret_job/cargo display_name = "Beret, cargo" path = /obj/item/clothing/head/beret/cargo - allowed_roles = list("Quartermaster", "Cargo Technician") + allowed_roles = list("Quartermaster", "Cargo Technician", "Shaft Miner", "Explorer") /datum/gear/hat/beret_job/qm display_name = "Beret, quartermaster" @@ -210,7 +220,7 @@ /datum/gear/hat/beret_job/sci display_name = "Beret, science" path = /obj/item/clothing/head/beret/sci - allowed_roles = list("Research Director", "Scientist") + allowed_roles = list("Research Director", "Scientist", "Geneticist") /datum/gear/hat/beret_job/robowhite display_name = "Beret, robotics" @@ -225,7 +235,7 @@ /datum/gear/hat/beret_job/med display_name = "Beret, medical" path = /obj/item/clothing/head/beret/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Coroner") + allowed_roles = list("Chief Medical Officer", "Medical Doctor" , "Virologist", "Geneticist", "Coroner", "Paramedic") /datum/gear/hat/beret_job/eng display_name = "Beret, engineering" diff --git a/code/modules/client/preference/loadout/loadout_suit.dm b/code/modules/client/preference/loadout/loadout_suit.dm index 3a483bbca70..b4f36409d1c 100644 --- a/code/modules/client/preference/loadout/loadout_suit.dm +++ b/code/modules/client/preference/loadout/loadout_suit.dm @@ -41,12 +41,12 @@ /datum/gear/suit/coat/job/med display_name = "Winter coat, medical" path = /obj/item/clothing/suit/hooded/wintercoat/medical - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner", "Geneticist") /datum/gear/suit/coat/job/sci display_name = "Winter coat, science" path = /obj/item/clothing/suit/hooded/wintercoat/science - allowed_roles = list("Scientist", "Research Director") + allowed_roles = list("Scientist", "Research Director", "Geneticist") /datum/gear/suit/coat/job/engi display_name = "Winter coat, engineering" @@ -129,7 +129,7 @@ /datum/gear/suit/bomber/job/medical display_name = "Bomber jacket, medical" path = /obj/item/clothing/suit/jacket/bomber/med - allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner") + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Psychiatrist", "Paramedic", "Virologist", "Coroner", "Geneticist") /datum/gear/suit/bomber/job/chemist display_name = "Bomber jacket, chemist" @@ -144,7 +144,7 @@ /datum/gear/suit/bomber/job/science display_name = "Bomber jacket, science" path = /obj/item/clothing/suit/jacket/bomber/sci - allowed_roles = list("Research Director", "Scientist") + allowed_roles = list("Research Director", "Scientist", "Geneticist") /datum/gear/suit/bomber/job/robotics display_name = "Bomber jacket, robotics" diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index d1e6b2e4563..c7e08bb49b3 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -84,7 +84,7 @@ strip_delay = 60 dog_fashion = /datum/dog_fashion/head/beret/sec -/obj/item/clothing/head/beret/sec/warden +/obj/item/clothing/head/beret/warden name = "warden's beret" desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class." icon_state = "beret_warden" diff --git a/code/modules/supply/supply_packs/pack_security.dm b/code/modules/supply/supply_packs/pack_security.dm index cd580d87dc2..f95c3cbc575 100644 --- a/code/modules/supply/supply_packs/pack_security.dm +++ b/code/modules/supply/supply_packs/pack_security.dm @@ -334,7 +334,7 @@ /obj/item/clothing/head/soft/sec/corp, /obj/item/clothing/head/soft/sec/corp, /obj/item/clothing/under/rank/security/warden/corporate, - /obj/item/clothing/head/beret/sec/warden, + /obj/item/clothing/head/beret/warden, /obj/item/clothing/under/rank/security/head_of_security/corporate, /obj/item/clothing/head/beret/hos) cost = 200