Kelenius 0071ed3f24 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/_onclick/click.dm
	code/_onclick/telekinesis.dm
	code/game/machinery/deployable.dm
	code/game/objects/items.dm
	code/game/objects/structures/grille.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/setup.dm

2015-06-07 14:05:54 +03:00

3.9 KiB

Raw Blame History

View Raw