Kelenius ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes ...

Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm

2015-05-25 20:35:46 +03:00

..

bats.dm

Updated force vars on bats.

2015-05-21 00:52:17 +09:30

kitchen.dm

…

knives.dm

…

material_weapons.dm

…

misc.dm

…

shards.dm

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

swords.dm

…

thrown.dm

…

twohanded.dm

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

twohanded.dm.orig

…