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

Standardised reagent colour mixing a little bit. Fixes issue 785.

Browse Source 
Changed the path of large beakers, so they're actually a subtype of beaker (wtf)

Moved new_year.dm to unused.
Updated Carn's sequential master controller to not have tension stuff, for potential live testing.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4444 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-08-16 18:33:34 +00:00
parent bdee209b43
commit 0970e6c55d
18 changed files with 358 additions and 505 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/WorkInProgress/carn/master_controller_sequential.dm
View File

@@ -47,7 +47,6 @@ datum/controller/game_controller/New()
world << "\red \b Job setup complete"
job_master.LoadJobs("config/jobs.txt")
if(!tension_master) tension_master = new /datum/tension()
if(!syndicate_code_phrase) syndicate_code_phrase = generate_code_phrase()
if(!syndicate_code_response) syndicate_code_response = generate_code_phrase()
if(!ticker) ticker = new /datum/controller/gameticker()
@@ -108,9 +107,6 @@ datum/controller/game_controller/proc/process()
air_master.process()
sleep(breather_ticks)
tension_master.process()
sleep(breather_ticks)
sun.calc_position()
sleep(breather_ticks)