Kelenius 2ba5fd6af2 Merge branch 'dev-freeze' into ofPuffsAndCleaner ...

Conflicts:
	code/game/objects/effects/chem/water.dm

2015-06-05 14:36:15 +03:00

..

effects

Merge branch 'dev-freeze' into ofPuffsAndCleaner

2015-06-05 14:36:15 +03:00

items

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

2015-06-05 10:23:23 +02:00

random

Final tweaks to recipe availability and material inheritance.

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

structures

Merge pull request #9573 from Zuhayr/chairs

2015-05-31 11:33:24 +03:00

buckling.dm

…

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

…

items.dm

…

objs.dm

…

structures.dm

Merge pull request #9390 from mwerezak/attack-animation

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

weapons.dm

…