cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-15 09:03:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into space_allocation

Browse Source
This commit is contained in:
Crazylemon64
2016-08-03 13:31:42 -07:00
parent 6ca037d9f4 bd0028aff1
commit 7db4094a38
65 changed files with 174 additions and 2702 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+5 -1
View File
@@ -24,7 +24,7 @@ var/global/pipe_processing_killed = 0
//There can be only one master_controller. Out with the old and in with the new.
if(master_controller != src)
if(istype(master_controller))
del(master_controller)
qdel(master_controller)
master_controller = src
var/watch=0
@@ -38,6 +38,10 @@ var/global/pipe_processing_killed = 0
if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
/datum/controller/game_controller/Destroy()
..()
return QDEL_HINT_HARDDEL_NOW
/datum/controller/game_controller/proc/setup()
world.tick_lag = config.Ticklag