Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into MechBay

commit.
This commit is contained in:
GeneralChaos81
2016-08-17 14:47:24 +10:00
173 changed files with 3163 additions and 4729 deletions
-4
View File
@@ -739,10 +739,6 @@ var/global/nologevent = 0
if(ticker.mode.config_tag == "cult")
return 2
return 1
if(M.mind in ticker.mode.malf_ai)
if(ticker.mode.config_tag == "malfunction")
return 2
return 1
if(M.mind in ticker.mode.syndicates)
if(ticker.mode.config_tag == "nuclear")
return 2