From 49b0d38112699d550401c18687b3070bacb42d63 Mon Sep 17 00:00:00 2001
From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
Date: Tue, 7 Jul 2020 13:47:56 -0400
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
---
 .../modules/projectiles/ammunition/special/magic.dm |  2 +-
 code/modules/projectiles/guns/magic/spell_book.dm   | 13 +++----------
 .../projectiles/projectile/magic/spellcard.dm       |  1 +
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/code/modules/projectiles/ammunition/special/magic.dm b/code/modules/projectiles/ammunition/special/magic.dm
index bea51efc24..8380bf82e9 100644
--- a/code/modules/projectiles/ammunition/special/magic.dm
+++ b/code/modules/projectiles/ammunition/special/magic.dm
@@ -45,7 +45,7 @@
 	projectile_type = /obj/item/projectile/magic/locker
 
 //Spell book ammo casing
-/obj/item/ammo_casing/magic/book/book
+/obj/item/ammo_casing/magic/book
 	projectile_type = /obj/item/projectile/magic/spellcard/book
 
 /obj/item/ammo_casing/magic/book/spark
diff --git a/code/modules/projectiles/guns/magic/spell_book.dm b/code/modules/projectiles/guns/magic/spell_book.dm
index 1577b7b024..fcdec185a2 100644
--- a/code/modules/projectiles/guns/magic/spell_book.dm
+++ b/code/modules/projectiles/guns/magic/spell_book.dm
@@ -19,19 +19,12 @@
 		return
 	..()
 
-/obj/item/gun/magic/wand/book/afterattack(atom/target, mob/living/user)
-	if(charges == 0)
-		shoot_with_empty_chamber(user)
-		return
-	if(target == user)
-		to_chat(user, "The book has [charges] pages\s remaining.</span>")
-	else
-		. = ..()
-	update_icon()
+/obj/item/gun/magic/wand/book/zap_self(mob/living/user)
+	to_chat(user, "The book has [charges] pages\s remaining.</span>")
 
 /obj/item/gun/magic/wand/book/attackby(obj/item/S, mob/living/user, params)
 	if(!istype(S, /obj/item/paper))
-		return
+		return ..()
 	if(charges < max_charges)
 		charges++
 		recharge_newshot()
diff --git a/code/modules/projectiles/projectile/magic/spellcard.dm b/code/modules/projectiles/projectile/magic/spellcard.dm
index 7acf52d878..109d2c81ee 100644
--- a/code/modules/projectiles/projectile/magic/spellcard.dm
+++ b/code/modules/projectiles/projectile/magic/spellcard.dm
@@ -41,6 +41,7 @@
 
 /obj/item/projectile/magic/spellcard/book/heal
 	damage = 0
+	nodamage  = TRUE
 
 /obj/item/projectile/magic/spellcard/book/heal/on_hit(atom/target, blocked = FALSE)
 	. = ..()