From ac4a41243afff794b75e3ddb51cf9650a617afc7 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Wed, 27 Apr 2022 14:58:54 +0100 Subject: [PATCH] add salt quirk --- code/__DEFINES/traits.dm | 1 + code/_globalvars/traits.dm | 1 + code/datums/traits/neutral.dm | 7 +++++++ code/modules/reagents/chemistry/reagents/food_reagents.dm | 7 +++++++ 4 files changed, 16 insertions(+) diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index cbfd8d7429..0c4a886b9f 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -352,6 +352,7 @@ #define STICKY_NODROP "sticky-nodrop" //sticky nodrop sounds like a bad soundcloud rapper's name #define TRAIT_SACRIFICED "sacrificed" //Makes sure that people cant be cult sacrificed twice. #define TRAIT_SPACEWALK "spacewalk" +#define TRAIT_SALT_SENSITIVE "salt_sensitive" /// obtained from mapping helper diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 4a8156d268..b5b3980c13 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -127,6 +127,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_FRIENDLY" = TRAIT_FRIENDLY, "TRAIT_IWASBATONED" = TRAIT_IWASBATONED, "TRAIT_SPACEWALK" = TRAIT_SPACEWALK + "TRAIT_SALT_SENSITIVE" = TRAIT_SALT_SENSITIVE ), /obj/item/bodypart = list( "TRAIT_PARALYSIS" = TRAIT_PARALYSIS diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 6b2cdbd455..aebe6ec7fa 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -179,3 +179,10 @@ var/mob/living/carbon/human/H = quirk_holder SEND_SIGNAL(H.back, COMSIG_TRY_STORAGE_SHOW, H) to_chat(quirk_holder, "You brought some extra dye with you! It's in your bag if you forgot.") + +/datum/quirk/salt_sensitive + name = "Sodium Sensitivity" + desc = "Your body is sensitive to sodium, and is burnt upon contact. Ingestion or contact with it is not advised." + value = 0 + medical_record_text = "Patient should not come into contact with sodium." + mob_trait = TRAIT_SALT_SENSITIVE diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 85836ffdf3..71339567d2 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -381,6 +381,13 @@ return if(M.has_bane(BANE_SALT)) M.mind.disrupt_spells(-200) + if(HAS_TRAIT(M, TRAIT_SALT_SENSITIVE)) // haha snails go brrr + M.adjustFireLoss(2) + M.emote("scream") + +/datum/reagent/consumable/sodiumchloride/on_mob_life(mob/living/M) + if(HAS_TRAIT(M, TRAIT_SALT_SENSITIVE)) + M.adjustFireLoss(1) // equal to a standard toxin /datum/reagent/consumable/sodiumchloride/reaction_turf(turf/T, reac_volume) //Creates an umbra-blocking salt pile if(!istype(T))