Kelenius dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm

2015-08-24 18:16:36 +03:00

..

effects

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

2015-08-22 02:30:14 +09:30

items

Merge branch 'dev' into ofMechfabAndPanic

2015-08-24 18:16:36 +03: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-freeze' into dev

2015-08-24 10:31:30 +02:00

buckling.dm

…

empulse.dm

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

2015-08-11 08:21:06 +02:00

explosion_recursive.dm

…

explosion.dm

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

2015-07-10 12:57:46 +02:00

items.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

objs.dm

Corrects CanUseObjTopic base proc.

2015-08-24 12:16:18 +02:00

structures.dm

Ports /tg/'s meteor implementation.

2015-06-05 14:58:35 +02:00

weapons.dm

…