PsiOmegaDelta f6eec096e7 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/_onclick/click.dm
	code/game/objects/items/weapons/material/kitchen.dm
	code/modules/mob/living/silicon/ai/ai.dm

2015-12-20 11:55:53 +01:00

..

ashtray.dm

…

bats.dm

Bats can now be slung over your back.

2015-11-20 19:36:27 +10:30

kitchen.dm

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

2015-12-20 11:55:53 +01:00

knives.dm

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

2015-07-14 08:21:12 +02:00

material_weapons.dm

Fixes missing ..()

2015-09-09 13:22:17 -04:00

misc.dm

Refactors various item attack() implementations

2015-09-08 23:39:33 -04:00

shards.dm

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

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

swords.dm

Refactors duplicate parry code

2015-08-28 14:39:28 -04:00

thrown.dm

…

twohanded.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

twohanded.dm.orig

…