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

Update laser_vr.dm

Browse Source
This commit is contained in:
Razgriz
2021-04-30 19:24:12 -07:00
committed by GitHub
parent baaf8eac84
commit 6b8a71a7b5
1 changed files with 5 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/laser_vr.dm
+5 -26
View File
@@ -256,38 +256,16 @@
name = "frontier carbine"
desc = "An ergonomically improved version of the venerable frontier phaser, the carbine is a fairly new weapon, and has only been produced in limited numbers so far. 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'
<<<<<<< HEAD
icon_state = "carbinekill"
item_state = "retro"
||||||| parent of 118c0861ac... Merge pull request #10210 from Novacat/nova-basicfixes
icon_state = "carbkill"
item_state = "energykill"
=======
icon_state = "carbinekill"
item_state = "energykill"
>>>>>>> 118c0861ac... Merge pull request #10210 from Novacat/nova-basicfixes
item_icons = list(slot_l_hand_str = 'icons/mob/items/lefthand_guns.dmi', slot_r_hand_str = 'icons/mob/items/righthand_guns.dmi')
phase_power = 150
<<<<<<< HEAD
modifystate = "carbinekill"
//CHOMP Edit: Changed beam type to new phaser beam type.
||||||| parent of 118c0861ac... Merge pull request #10210 from Novacat/nova-basicfixes
modifystate = "carbkill"
=======
modifystate = "carbinekill"
>>>>>>> 118c0861ac... Merge pull request #10210 from Novacat/nova-basicfixes
firemodes = list(
<<<<<<< HEAD
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="carbinekill", charge_cost = 300),
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 60),
||||||| parent of 118c0861ac... Merge pull request #10210 from Novacat/nova-basicfixes
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/blue, modifystate="carbkill", charge_cost = 300),
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/weaklaser/blue, modifystate="carbstun", charge_cost = 80),
=======
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),
>>>>>>> 118c0861ac... Merge pull request #10210 from Novacat/nova-basicfixes
list(mode_name="low-power", fire_delay=8, projectile_type=/obj/item/projectile/beam/phaser/light, modifystate="carbinestun", charge_cost = 80),
)
/obj/item/weapon/gun/energy/locked/frontier/carbine/update_icon()
@@ -345,11 +323,12 @@
scoped_accuracy = 40
one_handed_penalty = 50 // The weapon itself is heavy, and the long barrel makes it hard to hold steady with just one hand.
phase_power = 150 //efficient crank charger
projectile_type = /obj/item/projectile/beam/phaser/heavy //CHOMPEdit
modifystate = "riflekill"
//CHOMP Edit: Changed beam type to new phaser beam type.
firemodes = list(
list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/sniper, modifystate="riflekill", charge_cost = 600),
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam, modifystate="riflestun", charge_cost = 200),
list(mode_name="sniper", fire_delay=35, projectile_type=/obj/item/projectile/beam/phaser/heavy, modifystate="riflekill", charge_cost = 600),
list(mode_name="lethal", fire_delay=12, projectile_type=/obj/item/projectile/beam/phaser, modifystate="riflestun", charge_cost = 200),
)
/obj/item/weapon/gun/energy/locked/frontier/rifle/ui_action_click()