From 38e405ce768f84c2129cbc04fb5a7ec97597512f Mon Sep 17 00:00:00 2001 From: lass9030 Date: Mon, 1 Oct 2018 22:35:39 +0200 Subject: [PATCH] Remade, now uses a proc, much help from Zix --- .../diseases/advance/symptoms/sensory.dm | 37 +++++++++---------- 1 file changed, 17 insertions(+), 20 deletions(-) diff --git a/code/datums/diseases/advance/symptoms/sensory.dm b/code/datums/diseases/advance/symptoms/sensory.dm index 243e2744563..0d1dd15b15c 100644 --- a/code/datums/diseases/advance/symptoms/sensory.dm +++ b/code/datums/diseases/advance/symptoms/sensory.dm @@ -24,39 +24,36 @@ Bonus level = 5 severity = 0 +/datum/symptom/sensory_restoration/proc/check_and_add(var/reagent, var/check, var/add, var/mob/living/M) + if(M.reagents.get_reagent_amount(reagent) < check) + M.reagents.add_reagent(reagent, check) + return 1 + /datum/symptom/sensory_restoration/Activate(var/datum/disease/advance/A) ..() if(prob(SYMPTOM_ACTIVATION_PROB * 3)) var/mob/living/M = A.affected_mob + switch(A.stage) if(2) - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + if(check_and_add("oculine", 10, 10, M)) to_chat(M, "Your hearing feels clearer and crisp.") if(3) - if(M.reagents.get_reagent_amount("antihol") < 10) - M.reagents.add_reagent("antihol" = 10) + if(check_and_add("antihol", 10, 10, M)) to_chat(M, "You feel sober.") - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + check_and_add("oculine", 10, 10, M) if(4) - if(M.reagents.get_reagent_amount("synaphydramine") < 10) - M.reagents.add_reagent("synaphydramine" = 5) + if(check_and_add("synaphydramine", 10, 5, M)) to_chat(M, "You feel focused.") - if(M.reagents.get_reagent_amount("antihol") < 10) - M.reagents.add_reagent("antihol" = 10) - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + check_and_add("antihol", 10, 10, M) + check_and_add("oculine", 10, 10, M) if(5) - if(M.reagents.get_reagent_amount("mannitol") < 10) - M.reagents.add_reagent("mannitol" = 10) + if(check_and_add("mannitol", 10, 10, M)) to_chat(M, "Your mind feels relaxed.") - if(M.reagents.get_reagent_amount("synaphydramine") < 10) - M.reagents.add_reagent("synaphydramine" = 5) - if(M.reagents.get_reagent_amount("antihol") < 10) - M.reagents.add_reagent("antihol" = 10) - if(M.reagents.get_reagent_amount("oculine") < 10) - M.reagents.add_reagent("oculine", 10) + check_and_add("synaphydramine", 10, 5, M) + check_and_add("antihol", 10, 10, M) + check_and_add("oculine", 10, 10, M) + return /*