From 0c94fa335778b60a272f520b8102d7c11c3edb7a Mon Sep 17 00:00:00 2001 From: Jenny Date: Wed, 1 Oct 2025 15:49:05 -0500 Subject: [PATCH] Adds "start disabled" option to Reflexive Biting + Personal Bubble (#18582) * Adds reflexive biting trait option to start disabled * Defaults to true, + adds option to personal bubble cuz why not --- .../carbon/human/species/station/traits/neutral.dm | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm index 92e14a9d40e..c40a950bd79 100644 --- a/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm +++ b/code/modules/mob/living/carbon/human/species/station/traits/neutral.dm @@ -1560,10 +1560,12 @@ desc = "You will reflexively bite hands that attempt to pat your head or boop your nose, this can be toggled off." cost = 0 custom_only = FALSE + has_preferences = list("biting_toggle" = list(TRAIT_PREF_TYPE_BOOLEAN, "Enabled on spawn", TRAIT_NO_VAREDIT_TARGET, TRUE)) -/datum/trait/neutral/patting_defence/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/patting_defence/apply(var/datum/species/S, var/mob/living/carbon/human/H, var/list/trait_prefs) ..() - H.touch_reaction_flags |= SPECIES_TRAIT_PATTING_DEFENCE + if(trait_prefs && trait_prefs["biting_toggle"]) + H.touch_reaction_flags |= SPECIES_TRAIT_PATTING_DEFENCE add_verb(H, /mob/living/proc/toggle_patting_defence) /datum/trait/neutral/personal_space @@ -1571,10 +1573,12 @@ desc = "You are adept at avoiding unwanted physical contact and dodge it with ease. You will reflexively dodge any attempt to hug, pat, boop, lick, sniff you or even shake your hand, this can be toggled off." cost = 0 custom_only = FALSE + has_preferences = list("bubble_toggle" = list(TRAIT_PREF_TYPE_BOOLEAN, "Enabled on spawn", TRAIT_NO_VAREDIT_TARGET, TRUE)) -/datum/trait/neutral/personal_space/apply(var/datum/species/S,var/mob/living/carbon/human/H) +/datum/trait/neutral/personal_space/apply(var/datum/species/S, var/mob/living/carbon/human/H, var/list/trait_prefs) ..() - H.touch_reaction_flags |= SPECIES_TRAIT_PERSONAL_BUBBLE + if(trait_prefs && trait_prefs["bubble_toggle"]) + H.touch_reaction_flags |= SPECIES_TRAIT_PERSONAL_BUBBLE add_verb(H, /mob/living/proc/toggle_personal_space) /* // Commented out in lieu of finding a better solution.