From b437cd0e231a03333a119671de92e8d05ef854be Mon Sep 17 00:00:00 2001 From: nemvar <47324920+nemvar@users.noreply.github.com> Date: Fri, 8 May 2020 15:42:02 +0200 Subject: [PATCH] Fixes nothing (wand) (#50964) Fixes nothing (wand) --- code/modules/projectiles/ammunition/special/magic.dm | 2 +- code/modules/projectiles/guns/magic/staff.dm | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/special/magic.dm b/code/modules/projectiles/ammunition/special/magic.dm index 082c98dc062..b6c488fe08d 100644 --- a/code/modules/projectiles/ammunition/special/magic.dm +++ b/code/modules/projectiles/ammunition/special/magic.dm @@ -67,5 +67,5 @@ projectile_type = /obj/projectile/magic/wipe /obj/item/ammo_casing/magic/nothing - /obj/projectile/magic/nothing + projectile_type = /obj/projectile/magic/nothing harmful = FALSE diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index e8f1683d21a..47c489ba1de 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -1,5 +1,6 @@ /obj/item/gun/magic/staff slot_flags = ITEM_SLOT_BACK + ammo_type = /obj/item/ammo_casing/magic/nothing lefthand_file = 'icons/mob/inhands/weapons/staves_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' item_flags = NEEDS_PERMIT | NO_MAT_REDEMPTION