From 60e3451960cfc1d40597dcafe7fc6165d6c012e3 Mon Sep 17 00:00:00 2001 From: necromanceranne <40847847+necromanceranne@users.noreply.github.com> Date: Thu, 14 Aug 2025 22:52:05 +1000 Subject: [PATCH] Declutters settlers a bit. (#92425) --- code/controllers/subsystem/processing/quirks.dm | 4 ++-- code/datums/quirks/positive_quirks/settler.dm | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 843627c19a7..6c254dbdb36 100644 --- a/code/controllers/subsystem/processing/quirks.dm +++ b/code/controllers/subsystem/processing/quirks.dm @@ -24,9 +24,9 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list( list(/datum/quirk/mute, /datum/quirk/softspoken), list(/datum/quirk/poor_aim, /datum/quirk/bighands), list(/datum/quirk/bilingual, /datum/quirk/foreigner, /datum/quirk/csl), - list(/datum/quirk/spacer_born, /datum/quirk/item_quirk/settler), + list(/datum/quirk/spacer_born, /datum/quirk/settler), list(/datum/quirk/photophobia, /datum/quirk/nyctophobia), - list(/datum/quirk/item_quirk/settler, /datum/quirk/freerunning), + list(/datum/quirk/settler, /datum/quirk/freerunning), list(/datum/quirk/numb, /datum/quirk/selfaware), list(/datum/quirk/empath, /datum/quirk/evil), //SKYRAT EDIT ADDITION BEGIN diff --git a/code/datums/quirks/positive_quirks/settler.dm b/code/datums/quirks/positive_quirks/settler.dm index a66e0d644b2..52326541fdb 100644 --- a/code/datums/quirks/positive_quirks/settler.dm +++ b/code/datums/quirks/positive_quirks/settler.dm @@ -1,4 +1,4 @@ -/datum/quirk/item_quirk/settler +/datum/quirk/settler name = "Settler" //BUBBER EDIT (Changes text a bit) desc = "You are from a lineage of the earliest space settlers! You are much better at outdoorsmanship and \ @@ -23,7 +23,7 @@ TRAIT_STURDY_FRAME, ) -/datum/quirk/item_quirk/settler/add(client/client_source) +/datum/quirk/settler/add(client/client_source) var/mob/living/carbon/human/human_quirkholder = quirk_holder //SKYRAT EDIT BEGIN - This is so Teshari don't get the height decrease. //BUBBER EDIT REMOVAL START - Lol, not any more. @@ -32,14 +32,9 @@ //BUBBER EDIT REMOVAL END //SKYRAT EDIT END human_quirkholder.add_movespeed_modifier(/datum/movespeed_modifier/settler) - human_quirkholder.physiology.hunger_mod *= 0.75 //good for you, shortass, you don't get hungry nearly as often human_quirkholder.add_traits(settler_traits, QUIRK_TRAIT) -/datum/quirk/item_quirk/settler/add_unique(client/client_source) - give_item_to_holder(/obj/item/storage/box/papersack/wheat, list(LOCATION_BACKPACK, LOCATION_HANDS)) - give_item_to_holder(/obj/item/storage/toolbox/fishing/small, list(LOCATION_BACKPACK, LOCATION_HANDS)) - -/datum/quirk/item_quirk/settler/remove() +/datum/quirk/settler/remove() if(QDELING(quirk_holder)) return var/mob/living/carbon/human/human_quirkholder = quirk_holder @@ -47,5 +42,4 @@ //human_quirkholder.set_mob_height(HUMAN_HEIGHT_MEDIUM) //BUBBER EDIT REMOVAL END human_quirkholder.remove_movespeed_modifier(/datum/movespeed_modifier/settler) - human_quirkholder.physiology.hunger_mod /= 0.75 human_quirkholder.remove_traits(settler_traits, QUIRK_TRAIT)