From d492db3e581d45ee2d0886dabd216f8b7cdaee7a Mon Sep 17 00:00:00 2001
From: Nerd Lord <duorabbit2@gmail.com>
Date: Thu, 28 Jan 2016 12:50:38 -0500
Subject: [PATCH] useful commit message here

---
 code/_onclick/hud/hud.dm                             |  2 +-
 .../mob/living/simple_animal/guardian/guardian.dm    | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
index 952cfd803fb..6a1eda44dd8 100644
--- a/code/_onclick/hud/hud.dm
+++ b/code/_onclick/hud/hud.dm
@@ -101,7 +101,7 @@ var/datum/global_hud/global_hud = new()
 	var/obj/screen/blobpwrdisplay
 	var/obj/screen/blobhealthdisplay
 
-	var/obj/screen/guardian/healthdisplay
+	var/obj/screen/guardianhealthdisplay
 
 	var/obj/screen/alien_plasma_display
 
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 485d853d11e..584ca7886e1 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -99,7 +99,7 @@
 			resulthealth = round((summoner.health / abs(config.health_threshold_dead - summoner.maxHealth)) * 100)
 		else
 			resulthealth = round((summoner.health / summoner.maxHealth) * 100)
-		hud_used.healthdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#efeeef'>[resulthealth]%</font></div>"
+		hud_used.guardianhealthdisplay.maptext = "<div align='center' valign='middle' style='position:relative; top:0px; left:6px'><font color='#efeeef'>[resulthealth]%</font></div>"
 
 /mob/living/simple_animal/hostile/guardian/adjustHealth(amount) //The spirit is invincible, but passes on damage to the summoner
 	. =  ..()
@@ -749,11 +749,11 @@
 
 	var/obj/screen/using
 
-	healthdisplay = new /obj/screen/guardian()
-	healthdisplay.name = "summoner health"
-	healthdisplay.screen_loc = ui_health
-	healthdisplay.mouse_opacity = 0
-	adding += healthdisplay
+	guardianhealthdisplay = new /obj/screen/guardian()
+	guardianhealthdisplay.name = "summoner health"
+	guardianhealthdisplay.screen_loc = ui_health
+	guardianhealthdisplay.mouse_opacity = 0
+	adding += guardianhealthdisplay
 
 	using = new /obj/screen/guardian/Manifest()
 	using.screen_loc = ui_rhand