From f7dbce0cd08afe871247c09ef7bdc742af27e441 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 7 Jul 2020 13:55:02 -0400
Subject: [PATCH] Update spellcard.dm
---
.../projectiles/projectile/magic/spellcard.dm | 30 +++++++++----------
1 file changed, 14 insertions(+), 16 deletions(-)
diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm
index 109d2c81ee..1117db61fa 100644
--- a/code/modules/projectiles/projectile/magic/spellcard.dm
+++ b/code/modules/projectiles/projectile/magic/spellcard.dm
@@ -21,11 +21,10 @@
/obj/item/projectile/magic/spellcard/book/spark/on_hit(atom/target, blocked = FALSE)
. = ..()
var/mob/living/carbon/M = target
+ if(M.anti_magic_check())
+ M.visible_message("[src] vanishes on contact with [target]!")
+ return BULLET_ACT_BLOCK
if(iscarbon(target))
- if(M.anti_magic_check())
- M.visible_message("[src] vanishes on contact with [target]!")
- return BULLET_ACT_BLOCK
- else
M.adjust_fire_stacks(fire_stacks)
M.IgniteMob()
return
@@ -46,19 +45,18 @@
/obj/item/projectile/magic/spellcard/book/heal/on_hit(atom/target, blocked = FALSE)
. = ..()
var/mob/living/carbon/M = target
+ if(M.anti_magic_check())
+ M.visible_message("[src] vanishes on contact with [target]!")
+ return BULLET_ACT_BLOCK
if(iscarbon(target))
- if(M.anti_magic_check())
- M.visible_message("[src] vanishes on contact with [target]!")
- return BULLET_ACT_BLOCK
- else
- M.visible_message("[src] mends [target]!")
- M.adjustBruteLoss(-5) //HEALS
- M.adjustOxyLoss(-5)
- M.adjustBruteLoss(-5)
- M.adjustFireLoss(-5)
- M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs
- M.adjustCloneLoss(-5)
- M.adjustStaminaLoss(-5)
+ M.visible_message("[src] mends [target]!")
+ M.adjustBruteLoss(-5) //HEALS
+ M.adjustOxyLoss(-5)
+ M.adjustBruteLoss(-5)
+ M.adjustFireLoss(-5)
+ M.adjustToxLoss(-5, TRUE) //heals TOXINLOVERs
+ M.adjustCloneLoss(-5)
+ M.adjustStaminaLoss(-5)
return
else
return