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

Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/materials/material_sheets.dm
	code/modules/organs/organ_icon.dm
	code/setup.dm

2015-06-07 10:51:41 +02:00

..

ashtray.dm

Fixes #9581

2015-05-31 03:34:29 +09:30

bats.dm

…

kitchen.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

knives.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

material_weapons.dm

Fixes #9597

2015-06-06 11:20:56 +09:30

misc.dm

…

shards.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

swords.dm

…

thrown.dm

…

twohanded.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00

twohanded.dm.orig

…