GinjaNinja32 314a28fa75 Merge remote-tracking branch 'upstream/dev' into span_class=notice ...

Conflicts:
	code/game/antagonist/station/rogue_ai.dm
	code/game/machinery/OpTable.dm
	code/game/machinery/floodlight.dm
	code/game/machinery/spaceheater.dm

2015-06-02 17:33:20 +01:00

..

effects

objects/effects, objects/structures

2015-05-30 14:37:40 +01:00

items

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

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-02 17:33:20 +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

Ported action button system from Paradise/tg

2015-06-02 17:17:13 +09:30

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

…