cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-03 14:04:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
#	icons/mob/human_races/r_def_xenochimera.dmi
#	icons/mob/human_races/r_xenochimera.dmi
#	maps/RandomZLevels/blackmarketpackers.dmm
#	vorestation.dme
This commit is contained in:
Kelshark
2016-11-02 14:07:59 -04:00
parent b641f4b060 d1d4611431
commit e366747a6e
660 changed files with 12147 additions and 6125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/Processes/game_master.dm Normal file
View File

@@ -0,0 +1,6 @@
/datum/controller/process/game_master/setup()
name = "\improper GM controller"
schedule_interval = 600 // every 60 seconds
/datum/controller/process/game_master/doWork()
game_master.process()