From c8c0685288a18bc5e46809cfdbaa5ba8aea7f37b Mon Sep 17 00:00:00 2001
From: cacogen <25089914+cacogen@users.noreply.github.com>
Date: Fri, 13 Mar 2020 06:35:47 +1300
Subject: [PATCH] Replaces parent wand with wand of nothing on Donut (#49887)

* Replaces parent wand with wand of nothing on Donut

- Renames parent wand 'wand' to distinguish it from wand of nothing
- Simplifies parent wand's description to focus on the fact you shouldn't have it
- Makes parent wand delete itself when fired
- Renames parent magic projectile bolt to differentiate it from bolt of nothing

* prototype wand deletes itself on spawn

* removes snowflakey qdel of the base wand on spawn
---
 _maps/map_files/Donutstation/Donutstation.dmm | 2 +-
 code/modules/projectiles/guns/magic/wand.dm   | 5 +++--
 code/modules/projectiles/projectile/magic.dm  | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/_maps/map_files/Donutstation/Donutstation.dmm b/_maps/map_files/Donutstation/Donutstation.dmm
index 451b187a05d..51bb8c2f1d2 100644
--- a/_maps/map_files/Donutstation/Donutstation.dmm
+++ b/_maps/map_files/Donutstation/Donutstation.dmm
@@ -44377,7 +44377,7 @@
 	dir = 8
 	},
 /obj/item/toy/figure/mime,
-/obj/item/gun/magic/wand,
+/obj/item/gun/magic/wand/nothing,
 /turf/open/floor/carpet,
 /area/crew_quarters/theatre)
 "caf" = (
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index 7b8e2c79dfb..5f005dee928 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -1,6 +1,6 @@
 /obj/item/gun/magic/wand
-	name = "wand of nothing"
-	desc = "It's not just a stick, it's a MAGIC stick! You shouldn't have this."
+	name = "wand"
+	desc = "You shouldn't have this."
 	ammo_type = /obj/item/ammo_casing/magic
 	icon_state = "nothingwand"
 	item_state = "wand"
@@ -233,6 +233,7 @@
 /////////////////////////////////////
 
 /obj/item/gun/magic/wand/nothing
+	name = "wand of nothing"
 	desc = "It's not just a stick, it's a MAGIC stick?"
 	ammo_type = /obj/item/ammo_casing/magic/nothing
 
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 58c3ad9aadf..183c002944f 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -1,5 +1,5 @@
 /obj/projectile/magic
-	name = "bolt of nothing"
+	name = "bolt"
 	icon_state = "energy"
 	damage = 0
 	damage_type = OXY