From ec1df6c7e7cb258f6c17562c2b2572d7bfa9ac23 Mon Sep 17 00:00:00 2001 From: Couls Date: Sat, 12 Oct 2019 23:45:47 -0400 Subject: [PATCH] fix some blindness issues (#47024) About The Pull Request fixes #47020 #47022 I didn't have a max set for the adjust_blindness proc which allowed it to go below zero which meant if you took eye healing chems it would actually make you blind forever, the issue with the wizard spell blinding you permanently was due to a check to see if duration was less than charge_max for genetic spells which was used for making mutate permanent, but also made the blindness spell permament Why It's Good For The Game Being blind forever can suck Changelog cl fix: blindness spell now only blinds you temporarily fix: drinking carrot juice no longer permanently blinds you /cl --- code/modules/mob/status_procs.dm | 2 +- code/modules/spells/spell_types/wizard.dm | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm index 7019ba8ab98..0561641318f 100644 --- a/code/modules/mob/status_procs.dm +++ b/code/modules/mob/status_procs.dm @@ -32,7 +32,7 @@ */ /mob/proc/adjust_blindness(amount) var/old_eye_blind = eye_blind - eye_blind += amount + eye_blind = max(0, eye_blind + amount) if(!old_eye_blind || !eye_blind && !HAS_TRAIT(src, TRAIT_BLIND)) update_blindness() /** diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm index 63e71bdd5d7..29dd3193fca 100644 --- a/code/modules/spells/spell_types/wizard.dm +++ b/code/modules/spells/spell_types/wizard.dm @@ -259,7 +259,9 @@ /obj/effect/proc_holder/spell/targeted/genetic/blind mutations = list(BLINDMUT) duration = 300 + charge_max = 400 // needs to be higher than the duration or it'll be permanent sound = 'sound/magic/blind.ogg' + /obj/effect/proc_holder/spell/aoe_turf/repulse name = "Repulse" desc = "This spell throws everything around the user away."