Kelenius 6d54e1c655 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/game/turfs/simulated/walls.dm
	code/modules/mob/living/carbon/resist.dm
	code/modules/mob/mob_grab.dm

2015-05-21 17:00:50 +03:00

..

crossbow.dm

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

2015-05-16 22:38:01 +02:00

grenade_launcher.dm

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

pneumatic.dm

Compilation fixes.

2015-05-16 22:41:13 +02:00

rocket.dm

Removes click cooldowns almost everywhere.

2015-05-09 17:27:19 +03:00

syringe_gun.dm

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00