Merge pull request #1858 from caelaislinn/bs12_with_tgport

Miscellaneous things
This commit is contained in:
Hawk-v3
2012-11-03 09:04:59 -07:00
17 changed files with 3681 additions and 4937 deletions
+2 -1
View File
@@ -78,7 +78,8 @@
if(6)
viral_outbreak()
if(7)
alien_infestation()
if(prob(10))
alien_infestation()
if(8)
prison_break()
if(9)
+2 -2
View File
@@ -1,6 +1,6 @@
#define WHITELISTFILE "data/whitelist.txt"
var/list/whitelist
var/list/whitelist = list()
/proc/load_whitelist()
var/text = file2text(WHITELISTFILE)
@@ -14,7 +14,7 @@ var/list/whitelist
return 0
return ("[M.ckey]" in whitelist)
var/list/alien_whitelist
var/list/alien_whitelist = list()
proc/load_alienwhitelist()
var/text = file2text("config/alienwhitelist.txt")