From 092fe017a5a558336f13a85db594a90ae9d90b6b Mon Sep 17 00:00:00 2001 From: GDN <96800819+GDNgit@users.noreply.github.com> Date: Fri, 12 May 2023 01:52:55 -0500 Subject: [PATCH] Tea heals a bit more if you're british (#21068) * chav now gives slight healing on tea * Update code/_globalvars/traits.dm Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --------- Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com> --- code/__HELPERS/traits.dm | 1 + code/_globalvars/traits.dm | 1 + code/game/dna/mutations/disabilities.dm | 1 + code/modules/reagents/chemistry/reagents/drinks_reagents.dm | 3 +++ 4 files changed, 6 insertions(+) diff --git a/code/__HELPERS/traits.dm b/code/__HELPERS/traits.dm index 6d6863a0278..6d165280232 100644 --- a/code/__HELPERS/traits.dm +++ b/code/__HELPERS/traits.dm @@ -182,6 +182,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define TRAIT_BURN_WOUND_IMMUNE "burn_immune" #define TRAIT_COMIC_SANS "comic_sans" +#define TRAIT_CHAV "chav" #define TRAIT_NOFINGERPRINTS "no_fingerprints" #define TRAIT_SLOWDIGESTION "slow_digestion" #define TRAIT_COLORBLIND "colorblind" diff --git a/code/_globalvars/traits.dm b/code/_globalvars/traits.dm index 89d6fb61890..a6b2bc9abca 100644 --- a/code/_globalvars/traits.dm +++ b/code/_globalvars/traits.dm @@ -54,6 +54,7 @@ GLOBAL_LIST_INIT(traits_by_type, list( "TRAIT_STURDY_LIMBS" = TRAIT_STURDY_LIMBS, "TRAIT_COMIC_SANS" = TRAIT_COMIC_SANS, + "TRAIT_CHAV" = TRAIT_CHAV, "TRAIT_NOFINGERPRINTS" = TRAIT_NOFINGERPRINTS, "TRAIT_SLOWDIGESTION" = TRAIT_SLOWDIGESTION, "TRAIT_COLORBLIND" = TRAIT_COLORBLIND, diff --git a/code/game/dna/mutations/disabilities.dm b/code/game/dna/mutations/disabilities.dm index b64c7207951..e7d1448728f 100644 --- a/code/game/dna/mutations/disabilities.dm +++ b/code/game/dna/mutations/disabilities.dm @@ -305,6 +305,7 @@ desc = "Forces the language center of the subject's brain to construct sentences in a more rudimentary manner." activation_messages = list("Ye feel like a rite prat like, innit?") deactivation_messages = list("You no longer feel like being rude and sassy.") + traits_to_add = list(TRAIT_CHAV) //List of swappable words. Normal word first, chav word second. var/static/list/chavlinks = list( "arrest" = "nick", diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index 10ee2403521..bea7db87eaf 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -387,6 +387,9 @@ /datum/reagent/consumable/drink/tea/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(prob(20)) + if(HAS_TRAIT(M, TRAIT_CHAV)) + update_flags |= M.adjustBruteLoss(-1, FALSE) + update_flags |= M.adjustFireLoss(-1, FALSE) update_flags |= M.adjustToxLoss(-1, FALSE) return ..() | update_flags