From c8fff2839524fedafae7d5940da9c3c9b836351c Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 28 Jul 2020 00:12:00 -0400
Subject: [PATCH] Update spellcard.dm
---
.../projectiles/projectile/magic/spellcard.dm | 48 ++++++++++---------
1 file changed, 26 insertions(+), 22 deletions(-)
diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm
index 403d2513b9..5f9921bd62 100644
--- a/code/modules/projectiles/projectile/magic/spellcard.dm
+++ b/code/modules/projectiles/projectile/magic/spellcard.dm
@@ -21,16 +21,18 @@
/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(ismob(target))
+ var/mob/M = target
+ if(M.anti_magic_check())
+ M.visible_message("[src] vanishes on contact with [target]!")
+ return BULLET_ACT_BLOCK
- if(iscarbon(target))
- M.adjust_fire_stacks(fire_stacks)
- M.IgniteMob()
- return
- else
- damage = 20 //If we are a simplemob we deal 5x damage
+ if(iscarbon(target))
+ M.adjust_fire_stacks(fire_stacks)
+ M.IgniteMob()
+ return
+ else
+ damage = 20 //If we are a simplemob we deal 5x damage
/obj/item/projectile/magic/spellcard/book/shock
damage = 0
@@ -46,16 +48,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))
- 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
+ if(ismob(target))
+ var/mob/M = target
+ if(M.anti_magic_check())
+ M.visible_message("[src] vanishes on contact with [target]!")
+ return BULLET_ACT_BLOCK
+ if(iscarbon(target))
+ 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