more merge fixes

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
This commit is contained in:
Cael_Aislinn
2012-09-26 20:31:13 +10:00
parent 640ce4fd5c
commit 0fbf610ffb
2 changed files with 10 additions and 0 deletions
+1
View File
@@ -29,6 +29,7 @@
var/activeslot = 1 //Default active slot!
var/STFU_ghosts //80+ people rounds are fun to admin when text flies faster than airport security
var/STFU_radio //80+ people rounds are fun to admin when text flies faster than airport security
var/STFU_atklog = 0
///////////////
//SOUND STUFF//