PsiOmega 6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/material/shards.dm

2015-08-30 10:23:14 +02:00

..

effects

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

2015-08-25 12:29:59 +09:30

items

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

2015-08-30 10:23:14 +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-freeze' into dev

2015-08-25 08:20:13 +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

…