From a88766387d68e12dc7e6a5b6bc42b8ce02948999 Mon Sep 17 00:00:00 2001 From: TheDavestDave <30513964+TheDavestDave@users.noreply.github.com> Date: Sun, 20 Jun 2021 20:16:32 +0100 Subject: [PATCH] stops handbow changes overiding engery bow I didn't know it existed --- code/modules/projectiles/guns/energy/laser_vr.dm | 4 ++-- code/modules/projectiles/projectile/energy_vr.dm | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 5e5f9897e0f..b7e4fe3a66a 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -371,8 +371,8 @@ charge_cost = 600 modifystate = "handbowkill" firemodes = list( - list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/energy/bolt/heavy, modifystate="handbowkill", charge_cost = 600), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/bolt, modifystate="handbowstun", charge_cost = 200), + list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/energy/bow/heavy, modifystate="handbowkill", charge_cost = 600), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/bow, modifystate="handbowstun", charge_cost = 200), ) /obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked diff --git a/code/modules/projectiles/projectile/energy_vr.dm b/code/modules/projectiles/projectile/energy_vr.dm index b0e9bebb696..5bc690c1b5f 100644 --- a/code/modules/projectiles/projectile/energy_vr.dm +++ b/code/modules/projectiles/projectile/energy_vr.dm @@ -10,16 +10,16 @@ /obj/item/projectile/energy/flash/flare flash_range = 2 -/obj/item/projectile/energy/bolt +/obj/item/projectile/energy/bow name = "engergy bolt" icon_state = "cbbolt" damage = 20 -/obj/item/projectile/energy/bolt/heavy +/obj/item/projectile/energy/bow/heavy damage = 30 icon_state = "cbbolt" - -/obj/item/projectile/energy/bolt/stun + +/obj/item/projectile/energy/bow/stun name = "stun bolt" agony = 30