diff --git a/code/game/machinery/portable_turret.dm b/code/game/machinery/portable_turret.dm index 7949cbae652c8..4b5b3612fecab 100644 --- a/code/game/machinery/portable_turret.dm +++ b/code/game/machinery/portable_turret.dm @@ -495,6 +495,21 @@ Neutralize All Unidentified Life Signs: []
"}, if(!emagged) use_power(700) else use_power(1400) + else if(istype(E, /obj/item/weapon/gun/energy/staff)) + A = new /obj/item/projectile/change( loc ) + A.original = target.loc + icon_state = "target_prism" + if(!emagged) use_power(700) + else use_power(1400) + + else if(istype(E, /obj/item/weapon/gun/energy/ionrifle)) + A = new /obj/item/projectile/ion( loc ) + A.original = target.loc + icon_state = "target_prism" + if(!emagged) use_power(700) + else use_power(1400) + + else if(istype(E, /obj/item/weapon/gun/energy/taser) || istype(E, /obj/item/weapon/gun/energy/stunrevolver)) A = new /obj/item/projectile/energy/electrode( loc ) icon_state = "target_prism" diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 63e5798a4b620..5bbf52b0fc856 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -27,6 +27,7 @@ obj/item/weapon/gun/energy/staff icon_state = "staffofchange" item_state = "staffofchange" fire_sound = 'emitter.ogg' + flags = FPRINT | TABLEPASS | CONDUCT | ONBACK w_class = 4.0 charge_cost = 200 projectile_type = "/obj/item/projectile/change" diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi index a0886e9754e72..5fce05ad5eef6 100644 Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ