cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Razgriz
2021-06-24 17:44:08 -07:00
committed by GitHub
parent 618ca03c09
commit 878ff0b936
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/modules/projectiles/guns/energy/phase.dm
View File

@@ -55,13 +55,8 @@
charge_cost = 400 charge_cost = 400
recharge_time = 7 recharge_time = 7
<<<<<<< HEAD
obj/item/weapon/gun/energy/locked/phasegun/rifle /obj/item/weapon/gun/energy/locked/phasegun/rifle
||||||| parent of 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
obj/item/weapon/gun/energy/phasegun/rifle
=======
/obj/item/weapon/gun/energy/phasegun/rifle
>>>>>>> 18962f7a77... Merge pull request #10719 from VOREStation/upstream-merge-8150
name = "phase rifle" name = "phase rifle"
desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility." desc = "The RayZar EW31 Orion is a specialist energy weapon, intended for use against hostile wildlife. This one has a safety interlock that prevents firing while in proximity to the facility."
icon_state = "phaserifle" icon_state = "phaserifle"