Merge pull request #179 from Markolie/master

Bug fixes
This commit is contained in:
Fox-McCloud
2015-01-16 19:09:16 -05:00
5 changed files with 15 additions and 11 deletions
@@ -1,6 +1,6 @@
/obj/item/weapon/gun/energy/gun
name = "energy gun"
desc = "A basic energy-based gun with two settings: Stun and disable."
desc = "A basic energy-based gun with two settings: kill and disable."
icon_state = "energystun100"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Taser2.ogg'