From 38d09c8c1909ef13b74970b3951bcc2e5da1618b Mon Sep 17 00:00:00 2001
From: "johnsonmt88@gmail.com"
 <johnsonmt88@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Wed, 22 Aug 2012 01:40:48 +0000
Subject: [PATCH] Revolution game mode fixes:

Station-heads who are monkied now count as 'dead' for round completion.
- This previously applied to revheads but not station heads.

Changed get_all/living_heads to pull from the mob list instead of the player list.
- It was causing players to get skipped by the check-antag verb admins have if they were disconnected.

Runtime fix by Erro for:
runtime error: Cannot execute null.show inv().
proc name: done (/obj/effect/equip_e/human/done)
  source file: inventory.dm,562
  usr: Nodrak Davis (/mob/living/carbon/human)
  src: the human (/obj/effect/equip_e/human)
  call stack:
the human (/obj/effect/equip_e/human): done()
the human (/obj/effect/equip_e/human): process()

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4509 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/defines/procs/global_lists.dm                | 2 +-
 code/game/gamemodes/game_mode.dm                  | 4 ++--
 code/game/gamemodes/objective.dm                  | 2 +-
 code/modules/mob/living/carbon/human/inventory.dm | 2 +-
 html/changelog.html                               | 8 ++++++++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/code/defines/procs/global_lists.dm b/code/defines/procs/global_lists.dm
index 7d03659385..9f2942a30b 100644
--- a/code/defines/procs/global_lists.dm
+++ b/code/defines/procs/global_lists.dm
@@ -1,7 +1,7 @@
 //Since it didn't really belong in any other category, I'm putting this here
 //This is for procs to replace all the goddamn 'in world's that are chilling around the code
 
-var/global/list/player_list = list()				//List of all logged in players (Based on mob reference)
+var/global/list/player_list = list()				//List of all logged in players **with clients attached** (Based on mob reference)
 var/global/list/admin_list = list()					//List of all logged in admins (Based on mob reference)
 var/global/list/mob_list = list()					//List of all mobs, including clientless
 var/global/list/living_mob_list = list()			//List of all living mobs, including clientless
diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm
index 76e4ae567d..e194e34136 100644
--- a/code/game/gamemodes/game_mode.dm
+++ b/code/game/gamemodes/game_mode.dm
@@ -341,7 +341,7 @@ Whitespace:Seperator;
 ///////////////////////////////////
 /datum/game_mode/proc/get_living_heads()
 	var/list/heads = list()
-	for(var/mob/living/carbon/human/player in player_list)
+	for(var/mob/living/carbon/human/player in mob_list)
 		if(player.stat!=2 && player.mind && (player.mind.assigned_role in command_positions))
 			heads += player.mind
 	return heads
@@ -352,7 +352,7 @@ Whitespace:Seperator;
 ////////////////////////////
 /datum/game_mode/proc/get_all_heads()
 	var/list/heads = list()
-	for(var/mob/player in player_list)
+	for(var/mob/player in mob_list)
 		if(player.mind && (player.mind.assigned_role in command_positions))
 			heads += player.mind
 	return heads
diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm
index e4b02356af..7d36eec0e4 100644
--- a/code/game/gamemodes/objective.dm
+++ b/code/game/gamemodes/objective.dm
@@ -78,7 +78,7 @@ datum/objective/mutiny
 
 	check_completion()
 		if(target && target.current)
-			if(target.current.stat == DEAD)
+			if(target.current.stat == DEAD || !ishuman(target.current))
 				return 1
 			var/turf/T = get_turf(target.current)
 			if(T && (T.z != 1))			//If they leave the station they count as dead for this
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index 69f7cf9501..2f5bac9e1b 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -557,7 +557,7 @@ It can still be worn/put on as normal.
 					source.update_icons()
 					target.update_icons()
 
-	if(source)
+	if(source && target)
 		if(source.machine == target)
 			target.show_inv(source)
 	del(src)
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index 2ef787c846..96ebde7e1b 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -46,6 +46,14 @@ Stuff which is in development and not yet visible to players or just code relate
 should be listed in the changelog upon commit tho. Thanks. -->
 
 <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
+<div class="commit sansserif">
+	<h2 class="date">August 21, 2012</h2>
+	<h3 class="author">Nodrak updated:</h3>
+	<ul class="changes bgimages16">
+		<li class="bugfix">Have a bug to report? Visit: http://code.google.com/p/tgstation13/issues/list<br>Please ensure that the bug has not already been reported and <u>use the template provided</u>.</li>
+	</ul>
+</div>
+
 
 <div class="commit sansserif">
 	<h2 class="date">August 16, 2012</h2>