From 7fbfaef890b700381bd5844143d970a7fa400a76 Mon Sep 17 00:00:00 2001 From: Buggy123 Date: Wed, 30 Dec 2015 17:17:13 -0500 Subject: [PATCH] Nerfed holos: Owner always takes cloneloss --- .../mob/living/simple_animal/guardian/guardian.dm | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm index 14a03d2dbb..5837571951 100644 --- a/code/modules/mob/living/simple_animal/guardian/guardian.dm +++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm @@ -72,18 +72,18 @@ loc = get_turf(summoner) -/mob/living/simple_animal/hostile/guardian/adjustBruteLoss(amount) //The spirit is invincible, but passes on damage to the summoner +/mob/living/simple_animal/hostile/guardian/adjustCloneLoss(amount) //The spirit is invincible, but passes on damage to the summoner var/damage = amount * damage_transfer if (summoner) if(loc == summoner) return - summoner.adjustBruteLoss(damage) + summoner.adjustCloneLoss(damage) if(damage) - summoner << "Your [name] is under attack! You take damage!" - summoner.visible_message("Blood sprays from [summoner] as [src] takes damage!") + summoner << "Your [name] is under attack! You feel weaker!" + summoner.visible_message("[summoner] weakens as [src] takes damage!") if(summoner.stat == UNCONSCIOUS) summoner << "Your body can't take the strain of sustaining [src] in this condition, it begins to fall apart!" - summoner.adjustCloneLoss(damage/2) + summoner.adjustCloneLoss(damage/2) //50% extra damage while in crit /mob/living/simple_animal/hostile/guardian/ex_act(severity, target) switch (severity) @@ -91,10 +91,10 @@ gib() return if (2) - adjustBruteLoss(60) + adjustCloneLoss(60) if(3) - adjustBruteLoss(30) + adjustCloneLoss(30) /mob/living/simple_animal/hostile/guardian/gib() if(summoner) @@ -311,6 +311,7 @@ C.adjustFireLoss(-5) C.adjustOxyLoss(-5) C.adjustToxLoss(-5) + C.adjustCloneLoss(-5) /mob/living/simple_animal/hostile/guardian/healer/ToggleMode() if(src.loc == summoner)