From 9b5d15b0a6f036f976ce4be38b15cc22b2174f02 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 19 Sep 2015 08:48:10 -0400 Subject: [PATCH] Reagent Balance Tweaks --- code/modules/reagents/newchem/toxins.dm | 4 ++-- .../reagents/oldchem/reagents/reagents_toxin.dm | 15 ++++++++------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/reagents/newchem/toxins.dm b/code/modules/reagents/newchem/toxins.dm index 00135ad0c05..8668a0948f9 100644 --- a/code/modules/reagents/newchem/toxins.dm +++ b/code/modules/reagents/newchem/toxins.dm @@ -243,7 +243,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) if(volume >=5 && volume <=10) if(!H.unacidable) - M.take_organ_damage(max(volume-5,2)*4,0) + M.take_organ_damage(0,max(volume-5,2)*4) M.emote("scream") @@ -270,7 +270,7 @@ datum/reagent/facid/reaction_mob(var/mob/living/M, var/method=TOUCH, var/volume) if(!H.unacidable) var/obj/item/organ/external/affecting = H.get_organ("head") - affecting.take_damage(75, 0) + affecting.take_damage(0, 75) H.UpdateDamageIcon() H.emote("scream") H.status_flags |= DISFIGURED diff --git a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm index 955ef04e49d..341155bf2e6 100644 --- a/code/modules/reagents/oldchem/reagents/reagents_toxin.dm +++ b/code/modules/reagents/oldchem/reagents/reagents_toxin.dm @@ -187,7 +187,8 @@ /datum/reagent/radium/on_mob_life(var/mob/living/M as mob) if(!M) M = holder.my_atom - M.apply_effect(4*REM,IRRADIATE,0) + if(M.radiation < 80) + M.apply_effect(4,IRRADIATE,0) // radium may increase your chances to cure a disease if(istype(M,/mob/living/carbon)) // make sure to only use it on carbon mobs var/mob/living/carbon/C = M @@ -313,13 +314,13 @@ if(prob(75)) var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting) - affecting.take_damage(20, 0) + affecting.take_damage(5, 10) H.UpdateDamageIcon() H.emote("scream") else - M.take_organ_damage(15,0) + M.take_organ_damage(5,10) else - M.take_organ_damage(15,0) + M.take_organ_damage(5,10) if(method == INGEST) if(ishuman(M)) @@ -330,7 +331,7 @@ if(volume >=10 && volume <=25) if(!H.unacidable) - M.take_organ_damage(min(max(volume-10,2)*2,20),0) + M.take_organ_damage(0,min(max(volume-10,2)*2,20)) M.emote("scream") @@ -339,11 +340,11 @@ if(prob(75)) var/obj/item/organ/external/affecting = H.get_organ("head") if(affecting) - affecting.take_damage(20, 0) + affecting.take_damage(0, 20) H.UpdateDamageIcon() H.emote("scream") else - M.take_organ_damage(15,0) + M.take_organ_damage(0,20) /datum/reagent/sacid/reaction_obj(var/obj/O, var/volume) if((istype(O,/obj/item) || istype(O,/obj/effect/glowshroom)) && prob(40))