final stuff

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
This commit is contained in:
paprka
2014-04-26 19:25:56 -07:00
committed by ZomgPonies
parent b5e39a1283
commit f98cfc75ec
@@ -2,6 +2,7 @@
name = "ion rifle"
desc = "A man portable anti-armor weapon designed to disable mechanical threats"
icon_state = "ionrifle"
item_state = null //so the human update icon uses the icon_state instead.
fire_sound = 'sound/weapons/Laser.ogg'
origin_tech = "combat=2;magnets=4"
w_class = 4.0