mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 23:53:47 +01:00
Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
This commit is contained in:
@@ -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)
|
||||
*/
|
||||
*/
|
||||
|
||||
Reference in New Issue
Block a user