Cael Aislinn 6c46ceaf6d Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology ...

Conflicts:
	icons/obj/hydroponics.dmi

manual merge of conflicted icon file

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

2014-06-19 10:05:27 +10:00

..

__HELPERS

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

_onclick

…

ATMOSPHERICS

…

controllers

Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev

2014-06-11 09:15:28 +09:30

datums

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

defines

Merge branch 'master' into dev

2014-06-17 16:16:44 +04:00

FEA

…

game

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology

2014-06-19 10:05:27 +10:00

js

…

modules

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology

2014-06-19 10:05:27 +10:00

TriDimension

…

unused

Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.

2014-06-08 00:52:20 +09:30

WorkInProgress

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology

2014-06-19 10:05:27 +10:00

ZAS

Probability to bleed by airflow_hit lowered from 100% to 33%

2014-06-07 04:52:19 +02:00

global.dm

Merged master to dev, manually fixed merge issues in map, may be some left.

2014-06-11 18:11:41 +09:30

hub.dm

…

names.dm

…

setup.dm

Merge remote-tracking branch 'upstream/master' into dev

2014-06-12 18:56:26 +01:00

stylesheet.dm

…

world.dm

…