cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes issue 1063. Catatonic revheads count as alive in terms of the round not ending

Browse Source 
Catatonic players now count as dead for assassinate and mutiny objectives.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5115 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-11-18 21:43:53 +00:00
parent f9c4ce17e7
commit 0a610c3df6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/gamemodes/objective.dm
View File

@@ -52,7 +52,7 @@ datum/objective/assassinate
check_completion()
if(target && target.current)
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
if(target.current.stat == DEAD || issilicon(target.current) || isbrain(target.current) || target.current.z > 6 || !target.current.ckey) //Borgs/brains/AIs count as dead for traitor objectives. --NeoFite
return 1
return 0
return 1
@@ -79,7 +79,7 @@ datum/objective/mutiny
check_completion()
if(target && target.current)
if(target.current.stat == DEAD || !ishuman(target.current))
if(target.current.stat == DEAD || !ishuman(target.current) || !target.current.ckey)
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

8
html/changelog.html
View File

@@ -49,6 +49,14 @@ 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">18 November 2012</h2>
<h3 class="author">Petethegoat updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Catatonic people (those that have ghosted while alive) now count as dead for assasinate objectives.</li>
</ul>
</div>
<div class="commit sansserif">
<h2 class="date">17 November 2012</h2>
<h3 class="author">Donkie updated:</h3>