diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index ccc8bfb2d3b..bfb5c85678b 100644 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -18,6 +18,9 @@ obj/machinery/recharger if (istype(G, /obj/item/weapon/gun/energy/gun/nuclear) || istype(G, /obj/item/weapon/gun/energy/crossbow)) user << "Your gun's recharge port was removed to make room for a miniaturized reactor." return + if (istype(G, /obj/item/weapon/gun/energy/staff)) + user << "It's a wooden staff, not a gun!" + return user.drop_item() G.loc = src src.charging = G diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm index 45c7d5781eb..c3b345a278c 100644 --- a/code/modules/projectiles/guns/energy/special.dm +++ b/code/modules/projectiles/guns/energy/special.dm @@ -19,3 +19,35 @@ origin_tech = "combat=5;materials=4;powerstorage=3" charge_cost = 100 projectile_type = "/obj/item/projectile/energy/declone" + +obj/item/weapon/gun/energy/staff + name = "staff of change" + desc = "an artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself" + icon = 'gun.dmi' + icon_state = "staff" + item_state = "staff" + fire_sound = 'emitter.ogg' + charge_cost = 200 + projectile_type = "/obj/item/projectile/change" + origin_tech = null + var/charge_tick = 0 + + + New() + ..() + processing_objects.Add(src) + + + Del() + processing_objects.Remove(src) + ..() + + + process() + charge_tick++ + if(charge_tick < 4) return 0 + charge_tick = 0 + if(!power_supply) return 0 + power_supply.give(200) + update_icon() + return 1 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm index 052c237146d..ae20b7ca630 100644 --- a/code/modules/projectiles/projectile/special.dm +++ b/code/modules/projectiles/projectile/special.dm @@ -23,8 +23,6 @@ explosion(target, -1, 0, 2) return 1 - - /obj/item/projectile/temp name = "freeze beam" icon_state = "ice_2"