diff --git a/code/datums/supplypacks/munitions_vr.dm b/code/datums/supplypacks/munitions_vr.dm index e8674dd390..8e8312a3ef 100644 --- a/code/datums/supplypacks/munitions_vr.dm +++ b/code/datums/supplypacks/munitions_vr.dm @@ -7,4 +7,14 @@ cost = 35 containertype = /obj/structure/closet/crate/secure containername = "frontier phaser crate" - access = access_explorer \ No newline at end of file + access = access_explorer + +/datum/supply_pack/munitions/expeditionbows + name = "Frontier bows (station-locked) crate" + contains = list( + /obj/item/weapon/gun/energy/locked/frontier/handbow=2 + ) + cost = 20 + containertype = /obj/structure/closet/crate/secure + containername = "frontier phaser crate" + access = access_explorer diff --git a/code/modules/projectiles/guns/energy/laser_vr.dm b/code/modules/projectiles/guns/energy/laser_vr.dm index 6a564dbe0f..07d54f4164 100644 --- a/code/modules/projectiles/guns/energy/laser_vr.dm +++ b/code/modules/projectiles/guns/energy/laser_vr.dm @@ -358,3 +358,27 @@ req_access = newlist() //for toggling safety locked = 0 lockable = 0 + +///phaser bow/// + +/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." + icon = 'icons/obj/gun_vr.dmi' + icon_state = "handbowkill" + item_state = null + phase_power = 100 + + w_class = ITEMSIZE_SMALL + 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 = 160), + ) + +/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." + req_access = newlist() //for toggling safety + locked = 0 + lockable = 0 \ No newline at end of file diff --git a/code/modules/projectiles/projectile/energy_vr.dm b/code/modules/projectiles/projectile/energy_vr.dm index 5148c831bd..b0e9bebb69 100644 --- a/code/modules/projectiles/projectile/energy_vr.dm +++ b/code/modules/projectiles/projectile/energy_vr.dm @@ -8,4 +8,18 @@ flash_range = 1 /obj/item/projectile/energy/flash/flare - flash_range = 2 \ No newline at end of file + flash_range = 2 + +/obj/item/projectile/energy/bolt + name = "engergy bolt" + icon_state = "cbbolt" + damage = 20 + + +/obj/item/projectile/energy/bolt/heavy + damage = 30 + icon_state = "cbbolt" + +/obj/item/projectile/energy/bolt/stun + name = "stun bolt" + agony = 30 diff --git a/icons/obj/gun_vr.dmi b/icons/obj/gun_vr.dmi index a794ff88a3..e274e2c1fd 100644 Binary files a/icons/obj/gun_vr.dmi and b/icons/obj/gun_vr.dmi differ