From f68e7ac04e49eae84a559e660f846195c6653482 Mon Sep 17 00:00:00 2001 From: Bloop <13398309+vinylspiders@users.noreply.github.com> Date: Wed, 20 Dec 2023 13:11:59 -0500 Subject: [PATCH] [MODULAR] Fixes loadout item duplicate items bug (#25746) Fixes loadout item duplicate items bug --- .../loadout_items/donator/personal/donator_personal.dm | 6 ------ .../modules/loadouts/loadout_items/loadout_datum_glasses.dm | 2 +- .../modules/loadouts/loadout_items/loadout_datum_suit.dm | 2 +- .../loadouts/loadout_items/under/loadout_datum_under.dm | 4 ++-- tgui/packages/tgui/interfaces/LoadoutManager.tsx | 2 +- 5 files changed, 5 insertions(+), 11 deletions(-) diff --git a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm index 0f3d453df46..ce17c62539c 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/donator/personal/donator_personal.dm @@ -13,12 +13,6 @@ item_path = /obj/item/canvas/drawingtablet ckeywhitelist = list("thedragmeme") -/datum/loadout_item/shoes/heeled_jackboots - name = "High-heel Jackboots" - item_path = /obj/item/clothing/shoes/jackboots/heel -// ckeywhitelist = list("thedragmeme") -//As they requested, it's properly public now. - /datum/loadout_item/suit/furcoat name = "Leather coat with fur" item_path = /obj/item/clothing/suit/furcoat diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm index 13dd0118858..f8f74889b50 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_glasses.dm @@ -144,7 +144,7 @@ GLOBAL_LIST_INIT(loadout_glasses, generate_loadout_items(/datum/loadout_item/gla */ /datum/loadout_item/glasses/medicpatch - name = "Medical Eyepatch" + name = "Medical Eyepatch (Skyrat)" item_path = /obj/item/clothing/glasses/hud/eyepatch/med restricted_roles = list(JOB_MEDICAL_DOCTOR, JOB_CHIEF_MEDICAL_OFFICER, JOB_GENETICIST, JOB_CHEMIST, JOB_VIROLOGIST, JOB_PARAMEDIC, JOB_ORDERLY, JOB_CORONER) diff --git a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm index a153c2de271..3ad1e156db4 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/loadout_datum_suit.dm @@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(loadout_exosuits, generate_loadout_items(/datum/loadout_item/su item_path = /obj/item/clothing/suit/koreacoat /datum/loadout_item/suit/czech - name = "Modern Winter Coat" + name = "Czech Winter Coat" item_path = /obj/item/clothing/suit/modernwintercoatthing /datum/loadout_item/suit/mantella diff --git a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm index bb1a6699d58..46ca5d512b8 100644 --- a/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm +++ b/modular_skyrat/modules/loadouts/loadout_items/under/loadout_datum_under.dm @@ -145,7 +145,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ restricted_roles = list(JOB_PARAMEDIC) /datum/loadout_item/under/jumpsuit/paramed_light_skirt - name = "Light Paramedic Uniform" + name = "Light Paramedic Skirt" item_path = /obj/item/clothing/under/rank/medical/paramedic/skyrat/light/skirt restricted_roles = list(JOB_PARAMEDIC) @@ -387,7 +387,7 @@ GLOBAL_LIST_INIT(loadout_miscunders, generate_loadout_items(/datum/loadout_item/ item_path = /obj/item/clothing/under/dress/skirt/skyrat/red_skirt /datum/loadout_item/under/miscellaneous/black_skirt - name = "Black Skirt" + name = "Black Skirt (Skyrat)" item_path = /obj/item/clothing/under/dress/skirt/skyrat/black_skirt /datum/loadout_item/under/miscellaneous/swept_skirt diff --git a/tgui/packages/tgui/interfaces/LoadoutManager.tsx b/tgui/packages/tgui/interfaces/LoadoutManager.tsx index 7e6321a30f8..a4997269da6 100644 --- a/tgui/packages/tgui/interfaces/LoadoutManager.tsx +++ b/tgui/packages/tgui/interfaces/LoadoutManager.tsx @@ -94,7 +94,7 @@ export const LoadoutManager = (props) => { > {selectedTab.contents.map((item) => ( - + {item.name}