Chinsky 4f1afb3747 Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping ...

[Ready for Merge] Custom Item Update/Addition

2015-02-10 09:23:47 +03:00

..

__HELPERS

Merge pull request #7844 from Kelenius/ofDryingAndRacks

2015-02-04 18:15:13 +03:00

_onclick

Changes slime stun probabilities

2015-02-04 02:07:14 +03:00

ATMOSPHERICS

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

controllers

Readded asteroid secret placement, adjusted some values.

2015-01-23 13:40:10 +10:30

datums

Merge pull request #8081 from comma/maximumtrinkets

2015-02-10 06:51:30 +01:00

defines

Merge pull request #7924 from Kelenius/ofTablesAndPass

2015-01-30 16:17:41 +03:00

FEA

…

game

Merge pull request #8081 from comma/maximumtrinkets

2015-02-10 06:51:30 +01:00

js

…

modules

Merge pull request #8098 from MrSnapwalk/TheseArmsWereMadeForClamping

2015-02-10 09:23:47 +03:00

TriDimension

…

ZAS

Cleared out my WIP folder.

2015-02-03 03:20:42 -07:00

global.dm

Merge remote-tracking branch 'refs/remotes/origin/dev' into dev

2015-02-04 04:44:09 +06:00

hub.dm

…

names.dm

…

setup.dm

Minor cleanup in setup.dm

2015-02-09 08:27:38 +01:00

stylesheet.dm

Update stylesheet.dm

2015-01-25 22:31:25 +01:00

world.dm

Merge pull request #7964 from Baystation12/dev-freeze

2015-02-02 02:14:08 +10:30