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
This commit is contained in:
johnsonmt88@gmail.com
2012-08-22 01:40:48 +00:00
parent d6d50d838e
commit 38d09c8c19
5 changed files with 13 additions and 5 deletions
+1 -1
View File
@@ -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
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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
@@ -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)
+8
View File
@@ -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>