Chinsky e3f64178c8 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into definecrusade

2015-06-05 13:24:03 +03:00

..

effects

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

2015-06-05 13:24:03 +03:00

items

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

2015-06-05 10:39:41 +02:00

random

Final tweaks to recipe availability and material inheritance.

2015-05-17 18:22:21 +09:30

structures

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

buckling.dm

…

empulse.dm

…

explosion_recursive.dm

Merge resolution.

2015-05-11 11:47:24 +09:30

explosion.dm

new object-based lighting system

2015-05-10 20:54:25 +01:00

items.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

objs.dm

Merge pull request #9362 from Kelenius/ofResearchAndPrototypes

2015-05-25 19:55:01 +02:00

structures.dm

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

weapons.dm

…