Chinsky df4a8cf706 Merge pull request #5253 from faerindel/squash_tests ...

Adds buildable and upgradeable PSUs (battery racks, not SMES).

2014-06-15 07:15:14 +04:00

..

__HELPERS

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

2014-06-12 18:56:26 +01: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

Let's test this rebase thing.

2014-06-14 15:20:25 +01:00

FEA

…

game

Adds docking control to ERT shuttle

2014-06-14 18:35:02 -04:00

js

…

modules

Merge pull request #5253 from faerindel/squash_tests

2014-06-15 07:15:14 +04: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 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

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

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

stylesheet.dm

Reverted verb, adjusted color

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

world.dm

…