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 remote-tracking branch 'upstream/dev' into APC. Updates map with new SMES variable names.

Browse Source
This commit is contained in:
PsiOmega
2014-10-30 08:02:56 +01:00
parent 88c6b0f39e 67fbe9a66e
commit 955b64e0a5
25 changed files with 931 additions and 1005 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/controllers/master_controller.dm
View File

@@ -31,7 +31,6 @@ datum/controller/game_controller
var/last_thing_processed
var/mob/list/expensive_mobs = list()
var/rebuild_active_areas = 0
var/list/shuttle_list // For debugging and VV
var/datum/ore_distribution/asteroid_ore_map // For debugging and VV.