cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Declutters settlers a bit. (#92425)

Browse Source
This commit is contained in:
necromanceranne
2025-08-14 22:52:05 +10:00
committed by GitHub
parent 2a32194816
commit ae3b29018a
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/subsystem/processing/quirks.dm
View File

@@ -24,9 +24,9 @@ GLOBAL_LIST_INIT_TYPED(quirk_blacklist, /list/datum/quirk, list(
list(/datum/quirk/mute, /datum/quirk/softspoken), list(/datum/quirk/mute, /datum/quirk/softspoken),
list(/datum/quirk/poor_aim, /datum/quirk/bighands), list(/datum/quirk/poor_aim, /datum/quirk/bighands),
list(/datum/quirk/bilingual, /datum/quirk/foreigner, /datum/quirk/csl), 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/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/numb, /datum/quirk/selfaware),
list(/datum/quirk/empath, /datum/quirk/evil), list(/datum/quirk/empath, /datum/quirk/evil),
)) ))

12
code/datums/quirks/positive_quirks/settler.dm
View File

@@ -1,4 +1,4 @@
/datum/quirk/item_quirk/settler /datum/quirk/settler
name = "Settler" name = "Settler"
desc = "You are from a lineage of the earliest space settlers! While your family's generational exposure to varying gravity \ desc = "You are from a lineage of the earliest space settlers! While your family's generational exposure to varying gravity \
has resulted in a ... smaller height than is typical for your species, you make up for it by being much better at outdoorsmanship and \ has resulted in a ... smaller height than is typical for your species, you make up for it by being much better at outdoorsmanship and \
@@ -23,22 +23,16 @@
TRAIT_STURDY_FRAME, 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 var/mob/living/carbon/human/human_quirkholder = quirk_holder
human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST) human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST)
human_quirkholder.add_movespeed_modifier(/datum/movespeed_modifier/settler) 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) human_quirkholder.add_traits(settler_traits, QUIRK_TRAIT)
/datum/quirk/item_quirk/settler/add_unique(client/client_source) /datum/quirk/settler/remove()
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()
if(QDELING(quirk_holder)) if(QDELING(quirk_holder))
return return
var/mob/living/carbon/human/human_quirkholder = quirk_holder var/mob/living/carbon/human/human_quirkholder = quirk_holder
human_quirkholder.set_mob_height(HUMAN_HEIGHT_MEDIUM) human_quirkholder.set_mob_height(HUMAN_HEIGHT_MEDIUM)
human_quirkholder.remove_movespeed_modifier(/datum/movespeed_modifier/settler) human_quirkholder.remove_movespeed_modifier(/datum/movespeed_modifier/settler)
human_quirkholder.physiology.hunger_mod /= 0.75
human_quirkholder.remove_traits(settler_traits, QUIRK_TRAIT) human_quirkholder.remove_traits(settler_traits, QUIRK_TRAIT)