skull132 b20032ea25 Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

..

effects

BayMerge DLC Pack (#1355)

2017-01-05 00:06:44 +02:00

items

Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

random

Nuke disk fix, preferences fix, bay lore purge and more (#1523)

2017-01-12 23:03:40 +02:00

structures

Merge branch 'master' into development

2017-01-23 15:52:13 -05:00

buckling.dm

…

empulse.dm

…

explosion.dm

…

items.dm

Fixes #1564, #1330, #1434 and #1210 (#1621)

2017-01-21 22:53:58 +02:00

objs.dm

Fixes blobs and other stuff (#1513)

2017-01-11 22:24:39 +02:00

structures.dm

…

weapons.dm

…