Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

This commit is contained in:
Erthilo
2012-05-08 18:28:05 +01:00
28 changed files with 4638 additions and 4818 deletions
+1 -2
View File
@@ -21,7 +21,6 @@ Starting up. [time2text(world.timeofday, "hh:mm.ss")]
LoadBans()
process_teleport_locs() //Sets up the wizard teleport locations
process_ghost_teleport_locs() //Sets up ghost teleport locations.
sleep_offline = 1
if (config.kick_inactive)
spawn(30)
@@ -195,4 +194,4 @@ proc/countJob(rank)
var/mob/M = T.host
if(M.client && M.machine == subject)
subject.attack_hand(M)
*/
*/