shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27557

Browse Source
This commit is contained in:
LetterJay
2017-05-24 12:13:44 -05:00
parent ab7e9539bd 3814ad75be
commit a9aa36e5c0
62 changed files with 924 additions and 656 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/energy/energy_gun.dm
+6
View File
@@ -31,6 +31,12 @@
if(gun_light && gun_light.on)
add_overlay("mini-light")
/obj/item/weapon/gun/energy/e_gun/stun
name = "tactical energy gun"
desc = "Military issue energy gun, is able to fire stun rounds."
ammo_type = list(/obj/item/ammo_casing/energy/electrode/spec, /obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
/obj/item/weapon/gun/energy/e_gun/mini/practice_phaser
name = "practice phaser"
desc = "A modified version of the basic phaser gun, this one fires less concentrated energy bolts designed for target practice."