From 200cfe4809243d707b4513ce5a7585a48eeff33d Mon Sep 17 00:00:00 2001
From: "vageyenaman@gmail.com"
 <vageyenaman@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Mon, 5 Mar 2012 02:18:47 +0000
Subject: [PATCH] Fix for dna runtime spam in check_integrity()

Fix for eguns disappearing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3254 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/dna.dm                                | 8 ++++++++
 code/modules/projectiles/guns/energy.dm         | 6 ++++--
 code/modules/projectiles/guns/energy/nuclear.dm | 1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/code/game/dna.dm b/code/game/dna.dm
index 74227b71a0..c8779569fc 100644
--- a/code/game/dna.dm
+++ b/code/game/dna.dm
@@ -16,6 +16,14 @@
 			// determine DNA fragment from hairstyle
 			// :wtc:
 
+
+			// If the character doesn't have initialized hairstyles / beardstyles, initialize it for them!
+			if(!character.hair_style)
+				character.hair_style = new/datum/sprite_accessory/hair/short
+
+			if(!character.facial_hair_style)
+				character.facial_hair_style = new/datum/sprite_accessory/facial_hair/shaved
+
 			var/list/styles = typesof(/datum/sprite_accessory/hair) - /datum/sprite_accessory/hair
 			var/hrange = round(4095 / styles.len)
 
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index 5db138b695..87beffb247 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -24,7 +24,6 @@
 		else
 			power_supply = new(src)
 		power_supply.give(power_supply.maxcharge)
-		modifystate = icon_state
 		return
 
 
@@ -40,7 +39,10 @@
 	update_icon()
 		var/ratio = power_supply.charge / power_supply.maxcharge
 		ratio = round(ratio, 0.25) * 100
-		icon_state = text("[][]", modifystate, ratio)
+		if(modifystate)
+			icon_state = text("[][]", modifystate, ratio)
+		else
+			icon_state = text("[][]", initial(icon_state), ratio)
 
 
 
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 45964b6b82..16b0157aa4 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -7,6 +7,7 @@
 	charge_cost = 100 //How much energy is needed to fire.
 	projectile_type = "/obj/item/projectile/energy/electrode"
 	origin_tech = "combat=3;magnets=2"
+	modifystate = "energystun"
 
 	var
 		mode = 0 //0 = stun, 1 = kill