From 40b6fa692f16ed3123673c9fe5b9ffd0d9097676 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 19 Jun 2021 20:40:41 -0400 Subject: [PATCH] Phaser tweaks and bugfixes -Slightly increases the energy cost of low power phaser modes. -Fixes a typepath error for unlocked phaser bows -Fixes a typo in phaser bows --- code/modules/projectiles/guns/energy/laser_vr.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 500239e8e03..5e5f9897e0f 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -214,7 +214,7 @@ modifystate = "phaserkill" firemodes = list( list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="phaserkill", charge_cost = 300), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="phaserstun", charge_cost = 80), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="phaserstun", charge_cost = 100), ) /obj/item/weapon/gun/energy/locked/frontier/unload_ammo(var/mob/user) @@ -268,7 +268,7 @@ modifystate = "carbinekill" firemodes = list( list(mode_name="lethal", fire_delay=8, projectile_type=/obj/item/projectile/beam/blue, modifystate="carbinekill", charge_cost = 300), - list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbinestun", charge_cost = 80), + list(mode_name="low-power", fire_delay=5, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbinestun", charge_cost = 100), ) /obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon() @@ -299,7 +299,7 @@ modifystate = "holdoutkill" firemodes = list( list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="holdoutkill", charge_cost = 600), - list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="holdoutstun", charge_cost = 160), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="holdoutstun", charge_cost = 200), list(mode_name="stun", fire_delay=12, projectile_type=/obj/item/projectile/beam/stun/med, modifystate="holdoutshock", charge_cost = 300), ) @@ -361,7 +361,7 @@ /obj/item/weapon/gun/energy/locked/frontier/handbow name = "phaser handbow" - desc = "An minaturized weapon that fires a bolt of engery. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." + desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization. This one has a safety interlock that prevents firing while in proximity to the facility." icon = 'icons/obj/gun_vr.dmi' icon_state = "handbowkill" item_state = null @@ -372,11 +372,11 @@ 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 = 160), + list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/energy/bolt, modifystate="handbowstun", charge_cost = 200), ) -/obj/item/weapon/gun/energy/locked/frontier/holdout/unlocked - desc = "An minaturized weapon that fires a bolt of engery. Includes a built-in crank charger for recharging away from civilization." +/obj/item/weapon/gun/energy/locked/frontier/handbow/unlocked + desc = "An minaturized weapon that fires a bolt of energy. Includes a built-in crank charger for recharging away from civilization." req_access = newlist() //for toggling safety locked = 0 lockable = 0 \ No newline at end of file