From 8173cd24601136afcc6e18112fdf90bb477944db Mon Sep 17 00:00:00 2001 From: paprka Date: Sun, 1 Feb 2015 23:27:56 -0800 Subject: [PATCH] fixes pulse rifles not being emp proof apparently --- code/modules/projectiles/guns/energy/pulse.dm | 5 ++++- code/modules/projectiles/guns/energy/special.dm | 2 ++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index 66c74fd2006..a08db357269 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -2,7 +2,7 @@ name = "pulse rifle" desc = "A heavy-duty, multifaceted energy rifle with three modes. Preferred by front-line combat personnel." icon_state = "pulse" - item_state = "pulse" + item_state = null w_class = 4 force = 10 flags = CONDUCT @@ -13,6 +13,9 @@ /obj/item/weapon/gun/energy/pulse/attack_self(mob/living/user as mob) select_fire(user) +/obj/item/weapon/gun/energy/pulse/emp_act(severity) + return + /obj/item/weapon/gun/energy/pulse/loyalpin pin = /obj/item/device/firing_pin/implant/loyalty diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 1547e6857ce..9698ca64d37 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -122,6 +122,8 @@ overheat = 0 recent_reload = 0 ..() +/obj/item/weapon/gun/energy/kinetic_accelerator/emp_act(severity) + return /obj/item/weapon/gun/energy/kinetic_accelerator/attack_self(mob/living/user) if(overheat || recent_reload)