From a3969051d7c17c4e1c8c0834e94a2ca0e3bbbe82 Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Wed, 25 Nov 2015 19:30:30 -0500
Subject: [PATCH] Fixes HUD overlays, a runtime with borgs AND AI sec/medhuds

---
 code/modules/mob/living/carbon/human/life.dm   |  6 ++----
 code/modules/mob/living/life.dm                |  2 +-
 code/modules/mob/living/silicon/ai/life.dm     | 11 ++++++++---
 code/modules/mob/living/silicon/robot/life.dm  |  4 ++--
 code/modules/mob/living/silicon/robot/robot.dm |  3 ---
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index c33d88e086e..5f2be2317e2 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -90,6 +90,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(life_tick == 1)
 			regenerate_icons() // Make sure the inventory updates
 
+	if(ticker && ticker.mode.name == "nations")
+		process_nations()
 
 /mob/living/carbon/human/calculate_affecting_pressure(var/pressure)
 	..()
@@ -1070,10 +1072,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(hud_updateflag)
 			handle_hud_list()
 
-	if(get_nations_mode())
-		process_nations()
-
-
 
 /mob/living/carbon/human/handle_random_events()
 	// Puke if toxloss is too high
diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm
index e6549e29de2..08f47e84aee 100644
--- a/code/modules/mob/living/life.dm
+++ b/code/modules/mob/living/life.dm
@@ -307,5 +307,5 @@
 /mob/living/proc/process_nations()
 	if(client)
 		var/client/C = client
-		for(var/mob/living/carbon/human/H in view())
+		for(var/mob/living/carbon/human/H in view(src, 14))
 			C.images += H.hud_list[NATIONS_HUD]
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/ai/life.dm b/code/modules/mob/living/silicon/ai/life.dm
index 35764c0d762..72b0ae09988 100644
--- a/code/modules/mob/living/silicon/ai/life.dm
+++ b/code/modules/mob/living/silicon/ai/life.dm
@@ -55,7 +55,6 @@
 			aiRestorePowerRoutine = 0
 			blind.layer = 0
 
-		return
 
 	else
 
@@ -154,8 +153,8 @@
 		if (MED_HUD)
 			process_med_hud(src, 1, eyeobj)
 
-	if(get_nations_mode())
-		process_nations()
+	if(ticker && ticker.mode.name == "nations")
+		process_nations_ai()
 
 /mob/living/silicon/ai/updatehealth()
 	if(status_flags & GODMODE)
@@ -175,3 +174,9 @@
 /mob/living/silicon/ai/rejuvenate()
 	..()
 	add_ai_verbs(src)
+
+/mob/living/silicon/ai/proc/process_nations_ai()
+	if(client)
+		var/client/C = client
+		for(var/mob/living/carbon/human/H in view(eyeobj, 14))
+			C.images += H.hud_list[NATIONS_HUD]
\ No newline at end of file
diff --git a/code/modules/mob/living/silicon/robot/life.dm b/code/modules/mob/living/silicon/robot/life.dm
index a25c0ea2628..1c7c554ca65 100644
--- a/code/modules/mob/living/silicon/robot/life.dm
+++ b/code/modules/mob/living/silicon/robot/life.dm
@@ -13,6 +13,8 @@
 		process_locks()
 		process_queued_alarms()
 
+	if(ticker && ticker.mode.name == "nations")
+		process_nations()
 
 /mob/living/silicon/robot/proc/clamp_values()
 	SetStunned(min(stunned, 30))
@@ -263,8 +265,6 @@
 				mind.special_role = "traitor"
 				ticker.mode.traitors += src.mind
 
-	if(get_nations_mode())
-		process_nations()
 
 	..()
 	return 1
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 7b0413262c7..ce0e238fb31 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1431,7 +1431,6 @@ var/list/robot_verbs_default = list(
 	//subsystems
 	module.add_subsystems(src)
 
-	hands.icon_state = lowertext("Combat")
 	updatename()
 
 	status_flags &= ~CANPUSH
@@ -1439,7 +1438,6 @@ var/list/robot_verbs_default = list(
 	radio.config(module.channels)
 	notify_ai(2)
 
-
 /mob/living/silicon/robot/peacekeeper/New()
 	..()
 	module = new /obj/item/weapon/robot_module/peacekeeper(src)
@@ -1451,7 +1449,6 @@ var/list/robot_verbs_default = list(
 	//subsystems
 	module.add_subsystems(src)
 
-	hands.icon_state = lowertext("Combat")
 	updatename()
 
 	status_flags &= ~CANPUSH