cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-19 02:52:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source
This commit is contained in:
Mloc-Argent
2014-01-09 17:42:30 +00:00
parent 2187916870 70fe0e02cd
commit dfe18845be
29 changed files with 1154 additions and 1212 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/controllers/master_controller.dm
+1
View File
@@ -66,6 +66,7 @@ datum/controller/game_controller/proc/setup()
setupgenetics()
setupfactions()
setup_economy()
SetupXenoarch()
transfer_controller = new