Merge pull request #2661 from ZomgPonies/nations7

Nations 2.1.4 - final bugfix edition

code/modules/mob/living/carbon/human/life.dm

@@ -90,9 +90,6 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 		if(life_tick == 1)
 			regenerate_icons() // Make sure the inventory updates
 
-	if(get_nations_mode())
-		process_nations()
-
 /mob/living/carbon/human/calculate_affecting_pressure(var/pressure)
 	..()
 	var/pressure_difference = abs( pressure - ONE_ATMOSPHERE )

code/modules/mob/living/life.dm

@@ -56,7 +56,8 @@
 	if(client)
 		regular_hud_updates() //THIS DOESN'T FUCKING UPDATE SHIT
 		handle_regular_hud_updates() //IT JUST REMOVES FUCKING HUD IMAGES
-
+	if(get_nations_mode())
+		process_nations()
 
 /mob/living/proc/handle_breathing()
 	return

code/modules/mob/living/silicon/robot/life.dm

@@ -13,9 +13,6 @@
 		process_locks()
 		process_queued_alarms()
 
-	if(get_nations_mode())
-		process_nations()
-
 /mob/living/silicon/robot/proc/clamp_values()
 	SetStunned(min(stunned, 30))
 	SetParalysis(min(paralysis, 30))