From e54fad85250a894c875304a7eb3bc2945907a659 Mon Sep 17 00:00:00 2001 From: Varghh <26222480+Varghh@users.noreply.github.com> Date: Tue, 22 Dec 2020 13:19:03 -0300 Subject: [PATCH] Nuka cola speed buff nerf (#14815) * Nuka cola now gives radiation * Moxian review Co-authored-by: moxian * Nerf speed, remove radiation Co-authored-by: moxian --- code/__DEFINES/combat.dm | 1 + code/modules/mob/living/carbon/human/species/_species.dm | 2 ++ code/modules/reagents/chemistry/reagents/drink_cold.dm | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index e50baddb7a0..b526047237b 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -40,6 +40,7 @@ #define GOTTAGOFAST 32 #define IGNORESLOWDOWN 128 #define IGNORE_SPEED_CHANGES 256 +#define GOTTAGONOTSOFAST 512 //This is used for nukacola, mormal meth is a "1" speed up, nuka is 0.5 and they don't stack, feel free to use this one somewhere else #define GODMODE 4096 #define FAKEDEATH 8192 //Replaces stuff like changeling.changeling_fakedeath #define XENO_HOST 16384 //Tracks whether we're gonna be a baby alien's mummy. diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 1b4bc420096..42680f9f807 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -228,6 +228,8 @@ if(has_gravity(H)) if(H.status_flags & GOTTAGOFAST) . -= 1 + else if(H.status_flags & GOTTAGONOTSOFAST) + . -= 0.5 var/ignoreslow = FALSE if((H.status_flags & IGNORESLOWDOWN) || (RUN in H.mutations)) diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm index eb2cf6ac4f4..fb40e7133ef 100644 --- a/code/modules/reagents/chemistry/reagents/drink_cold.dm +++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm @@ -73,11 +73,11 @@ update_flags |= M.Druggy(30, FALSE) M.AdjustDizzy(5) M.SetDrowsy(0) - M.status_flags |= GOTTAGOFAST + M.status_flags |= GOTTAGONOTSOFAST return ..() | update_flags /datum/reagent/consumable/drink/cold/nuka_cola/on_mob_delete(mob/living/M) - M.status_flags &= ~GOTTAGOFAST + M.status_flags &= ~GOTTAGONOTSOFAST ..() /datum/reagent/consumable/drink/cold/spacemountainwind