Merging work into dev.

This commit is contained in:
Zuhayr
2014-07-10 20:25:07 +09:30
9 changed files with 214 additions and 14 deletions

View File

@@ -79,13 +79,6 @@ datum/controller/game_controller/proc/setup()
for(var/i=0, i<max_secret_rooms, i++)
make_mining_asteroid_secret()
//Create the mining ore distribution map.
var/datum/ore_distribution/O = new()
O.populate_distribution_map()
//Set up spawn points.
populate_spawn_points()
spawn(0)
if(ticker)
ticker.pregame()
@@ -114,6 +107,17 @@ 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.
world << "<b><font color='red'>Generating resource distribution map.</b></font>"
var/datum/ore_distribution/O = new()
O.populate_distribution_map()
//Set up spawn points.
populate_spawn_points()
//Set up gear list.
populate_gear_list()
world << "\red \b Initializations complete."
sleep(-1)