Zuhayr 136ccc347b Merge with dev.

2014-06-12 01:14:40 +09:30

..

__HELPERS

Merge branch 'dev' into mutiny

2014-06-03 21:27:42 -05:00

_onclick

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

2014-05-16 18:11:11 -05:00

ATMOSPHERICS

Makes it so mixers and filters no longer block mob

2014-05-22 03:00:18 -07:00

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

Hydroponics refactor, part 1: Files.

2014-06-11 03:44:29 +01:00

FEA

…

game

Merge with dev.

2014-06-12 01:14:40 +09:30

js

…

modules

Merge with dev.

2014-06-12 01:14:40 +09:30

TriDimension

…

unused

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

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

WorkInProgress

Merge with dev.

2014-06-12 01:14:40 +09:30

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

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

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

stylesheet.dm

Reverted verb, adjusted color

2014-05-22 16:34:45 -04:00

world.dm

Merge pull request #4912 from Ccomp5950/mentors

2014-05-07 10:00:27 +09:30