From 74fffea20e03754c695de6a88e883d0e8fd26c9f Mon Sep 17 00:00:00 2001 From: wraith-54321 <69217972+wraith-54321@users.noreply.github.com> Date: Sat, 16 Dec 2023 22:55:35 -0800 Subject: [PATCH] real --- code/modules/clothing/head/soft_caps.dm | 3 ++- monkestation/code/modules/trading/lootbox_clothing.dm | 7 +++++++ monkestation/code/modules/trading/lootbox_odds.dm | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index edca15b1c8ff..3bf8a7b8fd3b 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -169,4 +169,5 @@ /obj/item/clothing/head/soft/fishing_hat/Initialize(mapload) . = ..() - AddElement(/datum/element/skill_reward, /datum/skill/fishing) + if(add_element) //monkestation edit + AddElement(/datum/element/skill_reward, /datum/skill/fishing) diff --git a/monkestation/code/modules/trading/lootbox_clothing.dm b/monkestation/code/modules/trading/lootbox_clothing.dm index a38e596deeb5..cb323cf0c78d 100644 --- a/monkestation/code/modules/trading/lootbox_clothing.dm +++ b/monkestation/code/modules/trading/lootbox_clothing.dm @@ -9,6 +9,13 @@ acid = 30 wound = 0 +/obj/item/clothing/head/soft/fishing_hat + ///Do we add the skill reward element to this or not + var/add_element = TRUE + +/obj/item/clothing/head/soft/fishing_hat/lootbox + add_element = FALSE + //versions of clothing with low armor to get given by lootboxes /obj/item/clothing/head/beanie/durathread/lootbox/Initialize(mapload) . = ..() diff --git a/monkestation/code/modules/trading/lootbox_odds.dm b/monkestation/code/modules/trading/lootbox_odds.dm index ea69f45f6510..6bfe6de61bf8 100644 --- a/monkestation/code/modules/trading/lootbox_odds.dm +++ b/monkestation/code/modules/trading/lootbox_odds.dm @@ -211,7 +211,7 @@ GLOBAL_LIST_INIT(possible_lootbox_clothing, list( /obj/item/clothing/head/rasta, /obj/item/clothing/head/recruiter_cap/lootbox, /obj/item/clothing/head/saints, - /obj/item/clothing/head/soft/fishing_hat, //im tempted to make this extra rare + /obj/item/clothing/head/soft/fishing_hat/lootbox, //im tempted to make this extra rare /obj/item/clothing/head/soft/rainbow, /obj/item/clothing/head/soft/sec/lootbox, /obj/item/clothing/head/utility/hardhat/pumpkinhead/lootbox,