cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-23 12:08:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10714 from TheDavestDave/master

Browse Source 
stops handbow changes overiding engery bow
This commit is contained in:
Novacat
2021-06-20 17:43:42 -04:00
committed by GitHub
parent 14f10d25a4 a88766387d
commit 79eefa9f83
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/laser_vr.dm
+2 -2
View File
@@ -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
code/modules/projectiles/projectile/energy_vr.dm
+4 -4
View File
@@ -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