From 4ac7df8917738f393117ee5181358ae9d193e4da Mon Sep 17 00:00:00 2001 From: "baloh.matevz" Date: Fri, 17 Aug 2012 14:08:55 +0000 Subject: [PATCH] - fixed issue 809. Nodamage checks are now done on all the lowest level procs as well as the higher level brute and burn damage procs for humans. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4475 316c924e-a436-60f5-8080-3fe189b3f50e --- code/modules/mob/living/living.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 39825bcafa2..2292a42195b 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -84,62 +84,75 @@ // ++++ROCKDTBEN++++ MOB PROCS -- Ask me before touching. // Stop! ... Hammertime! ~Carn +// I touched them without asking... I'm soooo edgy ~Erro (added nodamage checks) /mob/living/proc/getBruteLoss() return bruteloss /mob/living/proc/adjustBruteLoss(var/amount) + if(src.nodamage) return 0 //godmode bruteloss = min(max(bruteloss + amount, 0),(maxHealth*2)) /mob/living/proc/getOxyLoss() return oxyloss /mob/living/proc/adjustOxyLoss(var/amount) + if(src.nodamage) return 0 //godmode oxyloss = min(max(oxyloss + amount, 0),(maxHealth*2)) /mob/living/proc/setOxyLoss(var/amount) + if(src.nodamage) return 0 //godmode oxyloss = amount /mob/living/proc/getToxLoss() return toxloss /mob/living/proc/adjustToxLoss(var/amount) + if(src.nodamage) return 0 //godmode toxloss = min(max(toxloss + amount, 0),(maxHealth*2)) /mob/living/proc/setToxLoss(var/amount) + if(src.nodamage) return 0 //godmode toxloss = amount /mob/living/proc/getFireLoss() return fireloss /mob/living/proc/adjustFireLoss(var/amount) + if(src.nodamage) return 0 //godmode fireloss = min(max(fireloss + amount, 0),(maxHealth*2)) /mob/living/proc/getCloneLoss() return cloneloss /mob/living/proc/adjustCloneLoss(var/amount) + if(src.nodamage) return 0 //godmode cloneloss = min(max(cloneloss + amount, 0),(maxHealth*2)) /mob/living/proc/setCloneLoss(var/amount) + if(src.nodamage) return 0 //godmode cloneloss = amount /mob/living/proc/getBrainLoss() return brainloss /mob/living/proc/adjustBrainLoss(var/amount) + if(src.nodamage) return 0 //godmode brainloss = min(max(brainloss + amount, 0),(maxHealth*2)) /mob/living/proc/setBrainLoss(var/amount) + if(src.nodamage) return 0 //godmode brainloss = amount /mob/living/proc/getHalLoss() return halloss /mob/living/proc/adjustHalLoss(var/amount) + if(src.nodamage) return 0 //godmode halloss = min(max(halloss + amount, 0),(maxHealth*2)) /mob/living/proc/setHalLoss(var/amount) + if(src.nodamage) return 0 //godmode halloss = amount /mob/living/proc/getMaxHealth()