diff --git a/code/modules/projectiles/guns/gun.dm b/code/modules/projectiles/guns/gun.dm index 4b87bc23b9f..ab9efa8a1d0 100644 --- a/code/modules/projectiles/guns/gun.dm +++ b/code/modules/projectiles/guns/gun.dm @@ -486,6 +486,7 @@ pin.emag_act(remaining_charges, user) /obj/item/gun/proc/Fire(atom/target, mob/living/user, clickparams, pointblank=0, reflex=0) + SHOULD_NOT_OVERRIDE(TRUE) if(!user || !target) return if(target.z != user.z) return @@ -573,6 +574,7 @@ // Similar to the above proc, but does not require a user, which is ideal for things like turrets. /obj/item/gun/proc/Fire_userless(atom/target) + SHOULD_NOT_OVERRIDE(TRUE) if(!target) return