From 50b7b0e3a905105209f8a9ab738fc6889784d3c5 Mon Sep 17 00:00:00 2001
From: sunny <102998393+sunnyariess@users.noreply.github.com>
Date: Sun, 14 Sep 2025 12:16:59 +0200
Subject: [PATCH] Re-"Clutters" the Settler quirk (#4634)
## About The Pull Request
This is a reversion of
[this](https://github.com/tgstation/tgstation/pull/92425) TG PR.
## Why It's Good For The Game
If somebody considers the items to be "clutter", they can be tossed
away; I, and other people who select this quirk, use it, at least
partially, for the items.
## Proof Of Testing
Compiled, it works.
Screenshots/Videos
## Changelog
:cl: sunnyaries
balance: re-clutters settler
/:cl:
---------
Co-authored-by: Alexis
---
code/controllers/subsystem/processing/quirks.dm | 6 ++++--
code/datums/quirks/positive_quirks/settler.dm | 17 ++++++++++++++---
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
index 6d67f45872a..96b37612b95 100644
--- a/code/controllers/subsystem/processing/quirks.dm
+++ b/code/controllers/subsystem/processing/quirks.dm
@@ -24,9 +24,11 @@ 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/settler),
+ //BUBBER EDIT (item_quirk)
+ list(/datum/quirk/spacer_born, /datum/quirk/item_quirk/settler),
list(/datum/quirk/photophobia, /datum/quirk/nyctophobia),
- list(/datum/quirk/settler, /datum/quirk/freerunning),
+ //BUBBER EDIT (item_quirk)
+ list(/datum/quirk/item_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 52326541fdb..45cacf5113b 100644
--- a/code/datums/quirks/positive_quirks/settler.dm
+++ b/code/datums/quirks/positive_quirks/settler.dm
@@ -1,4 +1,5 @@
-/datum/quirk/settler
+//BUBBER EDIT (item quirk)
+/datum/quirk/item_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 +24,8 @@
TRAIT_STURDY_FRAME,
)
-/datum/quirk/settler/add(client/client_source)
+//BUBBER EDIT (item quick)
+/datum/quirk/item_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,9 +34,16 @@
//BUBBER EDIT REMOVAL END
//SKYRAT EDIT END
human_quirkholder.add_movespeed_modifier(/datum/movespeed_modifier/settler)
+ human_quirkholder.physiology.hunger_mod *= 0.75 // BUBBER EDIT - ADDITION
human_quirkholder.add_traits(settler_traits, QUIRK_TRAIT)
-/datum/quirk/settler/remove()
+//BUBBER EDIT START
+/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))
+//BUBBER EDIT END
+
+/datum/quirk/item_quirk/settler/remove()
if(QDELING(quirk_holder))
return
var/mob/living/carbon/human/human_quirkholder = quirk_holder
@@ -42,4 +51,6 @@
//human_quirkholder.set_mob_height(HUMAN_HEIGHT_MEDIUM)
//BUBBER EDIT REMOVAL END
human_quirkholder.remove_movespeed_modifier(/datum/movespeed_modifier/settler)
+ //BUBBER EDIT
+ human_quirkholder.physiology.hunger_mod /= 0.75
human_quirkholder.remove_traits(settler_traits, QUIRK_TRAIT)