From ae9658e4bd22497b80e41c2617ee87a309fd8a3f Mon Sep 17 00:00:00 2001
From: ZomgPonies <lorden@zomgponies.com>
Date: Mon, 2 Jun 2014 00:47:04 -0400
Subject: [PATCH] Final nations fixes, pretty sure this time.

---
 code/game/gamemodes/nations/flagprocs.dm     | 6 +++---
 code/game/gamemodes/nations/nations.dm       | 7 +++++++
 code/modules/mob/living/carbon/human/life.dm | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/code/game/gamemodes/nations/flagprocs.dm b/code/game/gamemodes/nations/flagprocs.dm
index 8749dcfb133..a6ea1b5281b 100644
--- a/code/game/gamemodes/nations/flagprocs.dm
+++ b/code/game/gamemodes/nations/flagprocs.dm
@@ -37,7 +37,7 @@
 	if(user.mind)
 		if(user.mind.nation)
 			var/obj/item/flag/nation/F = locate(user.mind.nation.flagpath)
-			if(user.mind.nation == nation) //Same team as flag
+			if(istype(user.mind.nation,nation)) //Same team as flag
 				if(liege && liege == F.liege)
 					user << "<span class='warning'>You can't steal your liege's flags!</span>"
 					return
@@ -78,7 +78,7 @@
 		anchored = 1
 		var/obj/item/flag/nation/F = locate(user.mind.nation.flagpath)
 		if(F.loc != F.startloc) return
-		for(var/obj/item/flag/nation/S in oview(1,F.startloc))
+		for(var/obj/item/flag/nation/S in orange(1,F.startloc))
 			if(S == src)
 				captured = 1
 				liege = F.nation
@@ -87,7 +87,7 @@
 				for(var/mob/living/carbon/human/H in player_list)
 					if(H.mind && H.mind.nation && F.nation && nation)
 						if(H.mind.nation.name == F.nation.name)
-							H.mind.current << "<span class='warning'>You have just vassalized [nation]! They must now obey any memebrs of your nation!</span>"
+							H.mind.current << "<span class='warning'>You have just vassalized [nation]! They must now obey any members of your nation!</span>"
 							continue
 						if(H.mind.nation.name == nation.name)
 							H.mind.current << "<span class='warning'>You are now vassals of [liege]! You must now obey the orders of any of their members!</span>"
diff --git a/code/game/gamemodes/nations/nations.dm b/code/game/gamemodes/nations/nations.dm
index a3adde4e7cb..ab998611c54 100644
--- a/code/game/gamemodes/nations/nations.dm
+++ b/code/game/gamemodes/nations/nations.dm
@@ -213,6 +213,13 @@ datum/game_mode/nations
 	else
 		dat += "You do not currently have any vassals! Capture flags to vassalize!<br>"
 	dat += "</table>"
+	dat += "<br><table cellspacing=5><tr><td><B>Geneva Space Convention</B></td><td></td></tr>"
+	dat += "The following are considered OUTLAWED by the Geneva Space Convention and will result"
+	dat += "in severe consequences if used in warfare:<br>"
+	dat += "<B>Scientopia - Large Scale Bombs - Nuclear Warfare"
+	dat += "Atmosia - Using atmos as a weapon - Chemical Warfare"
+	dat += "Medistan - Releasing harmful viruses - Biological Warfare</B>"
+	dat += "</table>"
 
 	dat += "</body></html>"
 	usr << browse(dat, "window=nationstatus;size=400x500")
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index aa01c5d8a19..9eefe35663e 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -2036,7 +2036,7 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 
 /mob/living/carbon/human/proc/process_nations()
 	var/client/C = client
-	for(var/mob/living/carbon/human/H in oview(src, 14))
+	for(var/mob/living/carbon/human/H in view(src, 14))
 		C.images += H.hud_list[NATIONS_HUD]