Merge pull request #844 from Mahzel/development

Fixes #801
This commit is contained in:
skull132
2016-01-10 19:12:45 +02:00
@@ -337,6 +337,7 @@
var/obj/item/weapon/gun/energy/new_gun = new spawn_type(src.loc)
new_item = new_gun
new_item.icon_state = "egun[rand(1,6)]"
new_item.icon = 'icons/obj/xenoarchaeology.dmi'
new_gun.desc = "This is an antique energy weapon, you're not sure if it will fire or not."
//5% chance to explode when first fired