cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Commit for Nodrak.

Browse Source 
See: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8107#p96230 for changelist.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3307 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-03-16 14:58:59 +00:00
parent 597674c671
commit 2c069f8a97
15 changed files with 259 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
code/datums/helper_datums/tension.dm
View File

@@ -264,9 +264,10 @@ var/global/datum/tension/tension_master
if(applicant.stat < 2)
if(applicant.mind)
if (!applicant.mind.special_role)
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(!jobban_isbanned(applicant, "traitor") && !jobban_isbanned(applicant, "Syndicate"))
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(candidates.len)
var/numTratiors = min(candidates.len, 3)
@@ -294,9 +295,10 @@ var/global/datum/tension/tension_master
if(applicant.stat < 2)
if(applicant.mind)
if (!applicant.mind.special_role)
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(!jobban_isbanned(applicant, "changeling") && !jobban_isbanned(applicant, "Syndicate"))
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(candidates.len)
var/numChanglings = min(candidates.len, 3)
@@ -323,9 +325,10 @@ var/global/datum/tension/tension_master
if(applicant.stat < 2)
if(applicant.mind)
if (!applicant.mind.special_role)
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(!jobban_isbanned(applicant, "revolutionary") && !jobban_isbanned(applicant, "Syndicate"))
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(candidates.len)
var/numRevs = min(candidates.len, 3)
@@ -344,14 +347,15 @@ var/global/datum/tension/tension_master
var/time_passed = world.time
for(var/mob/dead/observer/G in world)
spawn(0)
switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No"))
if("Yes")
if((world.time-time_passed)>300)//If more than 30 game seconds passed.
if(!jobban_isbanned(G, "wizard") && !jobban_isbanned(G, "Syndicate"))
spawn(0)
switch(alert(G, "Do you wish to be considered for the position of Space Wizard Foundation 'diplomat'?","Please answer in 30 seconds!","Yes","No"))
if("Yes")
if((world.time-time_passed)>300)//If more than 30 game seconds passed.
return
candidates += G
if("No")
return
candidates += G
if("No")
return
spawn(300)
@@ -383,9 +387,10 @@ var/global/datum/tension/tension_master
if(applicant.stat < 2)
if(applicant.mind)
if (!applicant.mind.special_role)
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(!jobban_isbanned(applicant, "cultist") && !jobban_isbanned(applicant, "Syndicate"))
if(!(applicant.job in temp.restricted_jobs))
if(applicant.client)
candidates += applicant
if(candidates.len)
var/numCultists = min(candidates.len, 4)
@@ -409,14 +414,15 @@ var/global/datum/tension/tension_master
var/time_passed = world.time
for(var/mob/dead/observer/G in world)
spawn(0)
switch(alert(G,"Do you wish to be considered for a nuke team being sent in?","Please answer in 30 seconds!","Yes","No"))
if("Yes")
if((world.time-time_passed)>300)//If more than 30 game seconds passed.
if(!jobban_isbanned(G, "operative") && !jobban_isbanned(G, "Syndicate"))
spawn(0)
switch(alert(G,"Do you wish to be considered for a nuke team being sent in?","Please answer in 30 seconds!","Yes","No"))
if("Yes")
if((world.time-time_passed)>300)//If more than 30 game seconds passed.
return
candidates += G
if("No")
return
candidates += G
if("No")
return
spawn(300)