Merge branch 'master' of https://github.com/tgstation/-tg-station into ore_redemp_fixes

Also fixed some weird autodrobe runtime on startup
This commit is contained in:
Ergovisavi
2014-03-02 17:07:24 -08:00
97 changed files with 3874 additions and 5873 deletions

View File

@@ -75,7 +75,7 @@
var/allow_ai = 0 // allow ai job
var/traitor_scaling_coeff = 6 //how much does the amount of players get divided by to determine traitors
var/changeling_scaling_coeff = 10 //how much does the amount of players get divided by to determine changelings
var/changeling_scaling_coeff = 7 //how much does the amount of players get divided by to determine changelings
var/protect_roles_from_antagonist = 0// If security and such can be traitor/cult/other
var/allow_latejoin_antagonists = 0 // If late-joining players can be traitor/changeling