Cael_Aislinn 20aa136a08 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze ...

Conflicts:
	code/game/machinery/hydroponics.dm
	code/modules/reagents/Chemistry-Reagents.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-01-21 05:05:17 +10:00

..

__HELPERS

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

ATMOSPHERICS

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

controllers

added placeholder economic stuff (probably never finish it), added random system-wide events (which are announced at the newscaster when they occur)

2013-01-15 21:25:45 +10:00

datums

Merge pull request #2194 from comma/master

2013-01-16 17:57:05 -08:00

defines

removed a bunch of unused files, moved amorphs and meme to workinprogress/cib

2013-01-15 23:29:49 +10:00

FEA

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

game

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-21 05:05:17 +10:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

WorkInProgress

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

2013-01-17 18:20:17 +10:00

ZAS

Fixed runtimes in airflow.

2013-01-16 22:05:31 +04:00

global.dm

removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus'

2013-01-21 04:56:20 +10:00

hub.dm

…

names.dm

…

setup.dm

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

stylesheet.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

world.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00