Merge pull request #6896 from Hubblenaut/dev

Context-based Combat Part 1
This commit is contained in:
PsiOmegaDelta
2014-11-23 19:13:52 +01:00
6 changed files with 216 additions and 20 deletions

View File

@@ -1204,7 +1204,15 @@ datum/mind
return (duration <= world.time - brigged_since)
//Antagonist role check
/mob/living/proc/check_special_role(role)
if(mind)
if(!role)
return mind.special_role
else
return (mind.special_role == role) ? 1 : 0
else
return 0
//Initialisation procs
/mob/living/proc/mind_initialize()