From f98cfc75ecb5d592d68c56a6ac42b6cef920ca6f Mon Sep 17 00:00:00 2001
From: paprka <joecool9900@hotmail.com>
Date: Sat, 26 Apr 2014 19:25:56 -0700
Subject: [PATCH] final stuff

Conflicts:
	code/modules/projectiles/guns/energy/special.dm
	icons/mob/back.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
---
 code/modules/projectiles/guns/energy/special.dm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index d3b880823fc..d7a5ae1de70 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -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