cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into PowerTwo

Browse Source 
Conflicts:
	code/modules/power/solar.dm
This commit is contained in:
PsiOmega
2014-10-24 13:32:36 +02:00
parent 3a7066c6c1 f5d43128cc
commit 8e3861141c
228 changed files with 3066 additions and 2725 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/controllers/master_controller.dm
View File

@@ -121,12 +121,6 @@ datum/controller/game_controller/proc/setup_objects()
//Set up spawn points.
populate_spawn_points()
//Set up gear list.
populate_gear_list()
//Set up roundstart seed list.
populate_seed_list()
world << "\red \b Initializations complete."
sleep(-1)