Bunch of fixes left and right, fixes script to get giant map jpg

code/game/gamemodes/nations/flag_pinpointer.dm

@@ -0,0 +1,66 @@
+/obj/item/weapon/pinpointer/advpinpointer/flag
+	name = "\improper Flag Pinpointer"
+	desc = "Tracks the position of every nation's flag."
+
+/obj/item/weapon/pinpointer/advpinpointer/flag/attack_self()
+	switch(mode)
+		if (0)
+			mode = 1
+			active = 1
+			target = locate(/obj/item/flag/nation/atmos)
+			workobj()
+			usr << "\blue You calibrate \the [src] to locate the [target.name]"
+		if (1)
+			mode = 2
+			target = locate(/obj/item/flag/nation/sec)
+			usr << "\blue You calibrate \the [src] to locate the [target.name]"
+		if (2)
+			mode = 3
+			target = locate(/obj/item/flag/nation/cargo)
+			usr << "\blue You calibrate \the [src] to locate the [target.name]"
+		if (3)
+			mode = 4
+			target = locate(/obj/item/flag/nation/command)
+			usr << "\blue You calibrate \the [src] to locate the [target.name]"
+		if (4)
+			mode = 5
+			target = locate(/obj/item/flag/nation/med)
+			usr << "\blue You calibrate \the [src] to locate the [target.name]"
+		if (5)
+			mode = 6
+			target = locate(/obj/item/flag/nation/rnd)
+			usr << "\blue You calibrate \the [src] to locate the [target.name]"
+		else
+			mode = 0
+			active = 0
+			icon_state = "pinoff"
+			usr << "\blue You switch \the [src] off."
+
+/obj/item/weapon/pinpointer/advpinpointer/flag/examine()
+	switch(mode)
+		if (1)
+			usr << "Is is calibrated for the [target.name]"
+		if (2)
+			usr << "Is is calibrated for the [target.name]"
+		if (3)
+			usr << "Is is calibrated for the [target.name]"
+		if (4)
+			usr << "Is is calibrated for the [target.name]"
+		if (5)
+			usr << "Is is calibrated for the [target.name]"
+		else
+			usr << "It is switched off."
+
+/datum/supply_packs/key_pinpointer
+	name = "Nations Flag Pinpointer crate"
+	contains = list(/obj/item/weapon/pinpointer/advpinpointer/flag)
+	cost = 20
+	containertype = /obj/structure/closet/crate
+	containername = "Nations Flag Pinpointer crate"
+	access = access_heads
+	group = "Operations"
+
+	New()
+		// This crate is only accessible during mutiny rounds
+		if (istype(ticker.mode,/datum/game_mode/nations))
+			..()

code/game/gamemodes/nations/flagprocs.dm

@@ -58,10 +58,10 @@
 					var/obj/item/flag/nation/N = locate(liege.flagpath)
 					for(var/mob/living/carbon/human/H in player_list)
 						if(H.mind && H.mind.nation)
-							if(istype(H.mind.nation.flagpath,N))
+							if(H.mind.nation == liege)
 								world << "Stop being liege message works"
 								H.mind.current << "<span class='warning'>You are no longer the liege of [nation.name]!</span>"
-							if(istype(H.mind.nation.flagpath,src))
+							if(H.mind.nation == nation)
 								world << "Stop being vassal message works"
 								H.mind.current << "<span class='warning'>You are no longer vassals of [liege.name]!</span>"
 
@@ -78,24 +78,26 @@
 		anchored = 1
 		var/obj/item/flag/nation/F = locate(user.mind.nation.flagpath)
 		if(F.loc != F.startloc) return
-		for(var/obj/item/flag/S in oview(1,F.startloc))
-			if(src == S)
+		for(var/obj/item/flag/nation/S in oview(1,F.startloc))
+			if(S == src)
 				captured = 1
 				liege = F.nation
 				F.vassals += nation
 				//Announce capture/vassalage here.
 				for(var/mob/living/carbon/human/H in player_list)
 					if(H.mind && H.mind.nation)
-						if(istype(H.mind.nation.flagpath,F))
+						if(H.mind.nation==F.nation)
 							world << "Liege message works"
 							H.mind.current << "<span class='warning'>You have just vassalized [nation.name]! They must now obey any memebrs of your nation!</span>"
 							continue
-						else if(istype(H.mind.nation.flagpath,src))
+						if(H.mind.nation==nation)
 							world << "Vassalization message works"
 							H.mind.current << "<span class='warning'>You are now vassals of [liege.name]! You must now obey the orders of any of their members!</span>"
 							continue
 				//Check for Victory
-				for(var/obj/item/flag/nation/N in oview(1,F.startloc))
+				for(var/obj/item/flag/nation/N in flag_list)
+					if(F.nation == N.nation)
+						continue
 					if(N.captured && N.liege == F.nation)
 						continue
 					else

code/game/gamemodes/nations/nations.dm

@@ -66,6 +66,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else if(H.mind.assigned_role in medical_positions)
@@ -74,6 +75,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else if(H.mind.assigned_role in science_positions)
@@ -82,6 +84,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else if(H.mind.assigned_role in security_positions)
@@ -90,6 +93,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else if(H.mind.assigned_role in cargonians)
@@ -98,6 +102,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else if(H.mind.assigned_role in civilian_positions)
@@ -106,6 +111,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else if(H.mind.assigned_role == "Captain")
@@ -114,6 +120,7 @@ datum/game_mode/nations
 				H.verbs += /mob/proc/respawn_self
 				H.verbs += /mob/proc/nations_status
 				H.verbs -= /mob/living/verb/ghost
+				H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 				H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 				continue
 			else
@@ -135,7 +142,7 @@ datum/game_mode/nations
 				for(var/obj/item/flag/nation/cargo/C in flag_list)
 					C.startloc = get_turf(N)
 					continue
-			if("Command")
+			if("People's Republic of Commandzakstan")
 				for(var/obj/item/flag/nation/command/D in flag_list)
 					D.startloc = get_turf(N)
 					continue
@@ -293,9 +300,9 @@ datum/game_mode/nations
  */
 /hook/latespawn/proc/give_latejoiners_nations(var/mob/living/carbon/human/H)
 	var/datum/game_mode/nations/mode = get_nations_mode()
-	if (!mode) return
+	if (!mode) return 1
 
-	if(!mode.kickoff) return
+	if(!mode.kickoff) return 1
 
 	var/list/cargonians = list("Quartermaster","Cargo Technician","Shaft Miner")
 	if(H.mind)
@@ -305,6 +312,7 @@ datum/game_mode/nations
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else if(H.mind.assigned_role in medical_positions)
@@ -313,6 +321,7 @@ datum/game_mode/nations
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else if(H.mind.assigned_role in science_positions)
@@ -321,6 +330,7 @@ datum/game_mode/nations
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else if(H.mind.assigned_role in security_positions)
@@ -329,6 +339,7 @@ datum/game_mode/nations
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else if(H.mind.assigned_role in cargonians)
@@ -337,27 +348,30 @@ datum/game_mode/nations
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else if(H.mind.assigned_role in civilian_positions)
-			H.mind.nation = all_nations["Command"]
+			H.mind.nation = all_nations["People's Republic of Commandzakstan"]
 			H.hud_updateflag |= 1 << SPECIALROLE_HUD
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else if(H.mind.assigned_role == "Captain")
-			H.mind.nation = all_nations["Command"]
+			H.mind.nation = all_nations["People's Republic of Commandzakstan"]
 			H.hud_updateflag |= 1 << SPECIALROLE_HUD
 			H.verbs += /mob/proc/respawn_self
 			H.verbs += /mob/proc/nations_status
 			H.verbs -= /mob/living/verb/ghost
+			H.equip_or_collect(new /obj/item/weapon/pinpointer/advpinpointer/flag(H), slot_r_hand)
 			H << "You are now part of the great sovereign nation of [H.mind.nation.name]!"
 			return
 		else
 			message_admins("[H.name] with [H.mind.assigned_role] could not find any nation to assign!")
-			return
+			return 1
 
 
 /proc/get_nations_mode()

code/game/gamemodes/vampire/vampire_powers.dm

@@ -220,7 +220,7 @@
 			C.ear_deaf = 20
 			C.stuttering = 20
 			C.Stun(8)
-			C.make_jittery(150)
+			C.Jitter(150)
 		for(var/obj/structure/window/W in view(4))
 			W.destroy()
 		playsound(M.current.loc, 'sound/effects/creepyshriek.ogg', 100, 1)

code/modules/mob/dead/observer/observer.dm

@@ -97,7 +97,7 @@ Works together with spawning an observer, noted above.
 	if(antagHUD)
 		var/list/target_list = list()
 		for(var/mob/living/target in oview(src, 14))
-			if(target.mind&&(target.mind.special_role||issilicon(target)) )
+			if(target.mind&&(target.mind.special_role||issilicon(target)||target.mind.nation) )
 				target_list += target
 		if(target_list.len)
 			assess_targets(target_list, src)