Merge pull request #15606 from timothyteakettle/salt-quirk

an actual salt pr (adds sodium sensitivity quirk)
This commit is contained in:
silicons
2022-05-02 17:02:23 -07:00
committed by GitHub
4 changed files with 17 additions and 1 deletions
+1
View File
@@ -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
+2 -1
View File
@@ -126,7 +126,8 @@ GLOBAL_LIST_INIT(traits_by_type, list(
"TRAIT_EMPATH" = TRAIT_EMPATH,
"TRAIT_FRIENDLY" = TRAIT_FRIENDLY,
"TRAIT_IWASBATONED" = TRAIT_IWASBATONED,
"TRAIT_SPACEWALK" = TRAIT_SPACEWALK
"TRAIT_SPACEWALK" = TRAIT_SPACEWALK,
"TRAIT_SALT_SENSITIVE" = TRAIT_SALT_SENSITIVE
),
/obj/item/bodypart = list(
"TRAIT_PARALYSIS" = TRAIT_PARALYSIS
+7
View File
@@ -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, "<span class='boldnotice'>You brought some extra dye with you! It's in your bag if you forgot.</span>")
/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
@@ -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))