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

Conflicts:
	code/game/objects/items.dm

2015-07-06 18:33:09 +02:00

..

effects

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

2015-06-26 20:28:47 +02:00

items

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

2015-06-30 08:59:34 +02:00

random

Final tweaks to recipe availability and material inheritance.

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

structures

Updates hats to use item_state_slots where necessary.

2015-06-27 23:33:33 -04:00

buckling.dm

…

empulse.dm

…

explosion_recursive.dm

Merge resolution.

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

explosion.dm

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

2015-06-07 10:30:27 +02:00

items.dm

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

2015-07-06 18:33:09 +02:00

objs.dm

Merge pull request #9362 from Kelenius/ofResearchAndPrototypes

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

structures.dm

Ports /tg/'s meteor implementation.

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

weapons.dm

…