diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 60ce612f9dc..09de911802b 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -1,5 +1,6 @@
 /obj/item/weapon/gun/energy/gun
 	icon_state = "energystun100"
+	item_state = "energystun100"
 	name = "energy gun"
 	desc = "A basic energy-based gun with two settings: Stun and kill."
 	fire_sound = 'Taser.ogg'
diff --git a/code/modules/projectiles/guns/energy/stun.dm b/code/modules/projectiles/guns/energy/stun.dm
index ba7dd80b510..18dcb733d7f 100644
--- a/code/modules/projectiles/guns/energy/stun.dm
+++ b/code/modules/projectiles/guns/energy/stun.dm
@@ -3,6 +3,7 @@
 	name = "\improper Taser Gun"
 	desc = "A small, low capacity gun used for non-lethal takedowns."
 	icon_state = "taser"
+	item_state = "taser100"
 	fire_sound = 'Taser.ogg'
 	charge_cost = 100
 	projectile_type = "/obj/item/projectile/energy/electrode"
diff --git a/html/changelog.html b/html/changelog.html
index 824daa994de..55c829882d4 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,7 +51,8 @@ should be listed in the changelog upon commit though. Thanks. -->
 	<h2 class="date">1st May 2012</h2>
 	<h3 class="author">Erthilo updated:</h3>
 	<ul class="changes bgimages16">
-		<li class="rscadd">You can now respawn after 30 minutes in any mode where the win/loss condition is all crew dead.</li>
+		<li class="rscadd">You can now respawn after 30 minutes in any mode where the win/loss condition is not all crew dead.</li>
+		<li class="imageadd">New in-hand sprites for energy and taser guns courtesy of Flashkirby99.</li>
 	</ul>
 </div>
 
diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi
index 0674f0abd7b..c6dc652a5c6 100644
Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ
diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi
index 0f8bf8278fd..b1a1f0b1b60 100644
Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ