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

Merge pull request #6547 from Probe1/Runtime_is_the_mind_killer

Browse Source 
Fixes a shitload of runtimes from target.current in objective.dm
This commit is contained in:
Rob Nelson
2015-11-11 11:04:39 -08:00
parent 9d5bb0d9d9 d5e8e34db2
commit 79f7733675
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -404,7 +404,7 @@ var/list/potential_theft_objectives=list(
explanation_text = "Die a glorious death." explanation_text = "Die a glorious death."
check_completion() check_completion()
if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current) || isborer(target.current)) if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current) || isborer(owner.current))
return 1 //Brains no longer win survive objectives. --NEO return 1 //Brains no longer win survive objectives. --NEO
if(issilicon(owner.current) && owner.current != owner.original) if(issilicon(owner.current) && owner.current != owner.original)
return 1 return 1
@@ -417,7 +417,7 @@ var/list/potential_theft_objectives=list(
check_completion() check_completion()
if(blocked) return 0 if(blocked) return 0
if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current) || isborer(target.current)) if(!owner.current || owner.current.stat == DEAD || isbrain(owner.current) || isborer(owner.current))
return 0 //Brains no longer win survive objectives. --NEO return 0 //Brains no longer win survive objectives. --NEO
if(issilicon(owner.current) && owner.current != owner.original) if(issilicon(owner.current) && owner.current != owner.original)
return 0 return 0