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 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2014-07-16 19:30:41 +09:30
parent 1e2cc5c7ca 47a61c66a7
commit f795712a95
85 changed files with 724 additions and 299 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/controllers/master_controller.dm
View File

@@ -33,7 +33,9 @@ datum/controller/game_controller
var/mob/list/expensive_mobs = list()
var/rebuild_active_areas = 0
var/list/shuttle_list //for debugging and VV
var/list/shuttle_list // For debugging and VV
var/datum/ore_distribution/asteroid_ore_map // For debugging and VV.
datum/controller/game_controller/New()
//There can be only one master_controller. Out with the old and in with the new.
@@ -108,9 +110,9 @@ datum/controller/game_controller/proc/setup_objects()
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()
//Create the mining ore distribution map.
asteroid_ore_map = new /datum/ore_distribution()
asteroid_ore_map.populate_distribution_map()
//Set up spawn points.
populate_spawn_points()

21
code/controllers/verbs.dm
View File

@@ -1,6 +1,27 @@
//TODO: rewrite and standardise all controller datums to the datum/controller type
//TODO: allow all controllers to be deleted for clean restarts (see WIP master controller stuff) - MC done - lighting done
/client/proc/show_distribution_map()
set category = "Debug"
set name = "Show Distribution Map"
set desc = "Print the asteroid ore distribution map to the world."
if(!holder) return
if(master_controller && master_controller.asteroid_ore_map)
master_controller.asteroid_ore_map.print_distribution_map()
/client/proc/remake_distribution_map()
set category = "Debug"
set name = "Remake Distribution Map"
set desc = "Rebuild the asteroid ore distribution map."
if(!holder) return
if(master_controller && master_controller.asteroid_ore_map)
master_controller.asteroid_ore_map = new /datum/ore_distribution()
master_controller.asteroid_ore_map.populate_distribution_map()
/client/proc/restart_controller(controller in list("Master","Failsafe","Lighting","Supply"))
set category = "Debug"
set name = "Restart Controller"