diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm index 1058fc5d9aa..82ab648eefc 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), )) diff --git a/code/datums/quirks/positive_quirks/settler.dm b/code/datums/quirks/positive_quirks/settler.dm index ad19b9d7417..774919bdda6 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" 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 \ @@ -23,22 +23,16 @@ 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 human_quirkholder.set_mob_height(HUMAN_HEIGHT_SHORTEST) 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 human_quirkholder.set_mob_height(HUMAN_HEIGHT_MEDIUM) human_quirkholder.remove_movespeed_modifier(/datum/movespeed_modifier/settler) - human_quirkholder.physiology.hunger_mod /= 0.75 human_quirkholder.remove_traits(settler_traits, QUIRK_TRAIT)