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

Merge branch 'hydroponics' of https://github.com/Zuhayr/Baystation12 into hydroponics

Browse Source
This commit is contained in:
Zuhayr
2014-07-26 15:45:26 +09:30
parent 5a108b2d05 69b397b5c4
commit bc25cca7a9
30 changed files with 3698 additions and 3261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/controllers/master_controller.dm
View File

@@ -109,7 +109,6 @@ datum/controller/game_controller/proc/setup_objects()
var/obj/machinery/atmospherics/unary/vent_scrubber/T = U
T.broadcast_status()
//Create the mining ore distribution map.
//Create the mining ore distribution map.
asteroid_ore_map = new /datum/ore_distribution()
asteroid_ore_map.populate_distribution_map()
@@ -120,6 +119,9 @@ datum/controller/game_controller/proc/setup_objects()
//Set up gear list.
populate_gear_list()
//Set up roundstart seed list.
populate_seed_list()
world << "\red \b Initializations complete."
sleep(-1)