From 44ff69c799deeab3afd6addd5b277ede48609309 Mon Sep 17 00:00:00 2001 From: Robustin Date: Sat, 16 Apr 2016 06:39:04 -0400 Subject: [PATCH] Honk Bullet (#16788) Adds honk bullet and staff. --- code/modules/projectiles/ammunition/special.dm | 5 ++++- code/modules/projectiles/guns/magic/staff.dm | 10 ++++++++++ code/modules/projectiles/projectile/bullets.dm | 15 +++++++++++++++ 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/code/modules/projectiles/ammunition/special.dm b/code/modules/projectiles/ammunition/special.dm index 77987f9ef59..b91ce29a999 100644 --- a/code/modules/projectiles/ammunition/special.dm +++ b/code/modules/projectiles/ammunition/special.dm @@ -31,6 +31,9 @@ projectile_type = pick(typesof(/obj/item/projectile/magic)) ..() +/obj/item/ammo_casing/magic/honk + projectile_type = /obj/item/projectile/bullet/honker + /obj/item/ammo_casing/syringegun name = "syringe gun spring" desc = "A high-power spring that throws syringes." @@ -40,4 +43,4 @@ projectile_type = /obj/item/projectile/bullet/midbullet3 select_name = "spraydown" fire_sound = 'sound/weapons/gunshot_smg.ogg' - e_cost = 20 \ No newline at end of file + e_cost = 20 diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm index fd472c9a916..030ca7cac0e 100644 --- a/code/modules/projectiles/guns/magic/staff.dm +++ b/code/modules/projectiles/guns/magic/staff.dm @@ -49,3 +49,13 @@ max_charges = 10 recharge_rate = 2 no_den_usage = 1 + +/obj/item/weapon/gun/magic/staff/honk + name = "staff of the honkmother" + desc = "Honk" + fire_sound = "sound/items/bikehorn.ogg" + ammo_type = /obj/item/ammo_casing/magic/honk + icon_state = "staffofnothing" + item_state = "staffofnothing" + max_charges = 6 + recharge_rate = 2 diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm index a3d5036182c..1737d923621 100644 --- a/code/modules/projectiles/projectile/bullets.dm +++ b/code/modules/projectiles/projectile/bullets.dm @@ -124,6 +124,21 @@ damage = 10 weaken = 4 stun = 4 + +/obj/item/projectile/bullet/honker + damage = 0 + weaken = 5 + stun = 5 + forcedodge = 1 + nodamage = 1 + hitsound = 'sound/items/bikehorn.ogg' + icon = 'icons/obj/hydroponics/harvest.dmi' + icon_state = "banana" + range = 200 + +/obj/item/projectile/bullet/honker/New() + ..() + SpinAnimation() /obj/item/projectile/bullet/meteorshot/on_hit(atom/target, blocked = 0) . = ..()