Kelenius 60196df634 Merge branch 'dev' into ofClicksAndCooldowns ...

Conflicts:
	code/modules/projectiles/gun.dm

2015-08-13 08:40:31 +03:00

..

crossbow.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

grenade_launcher.dm

Changed steel material name to a define.

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

pneumatic.dm

Fixes #10314

2015-08-02 00:01:10 -04:00

rocket.dm

Merge branch 'dev' into ofClicksAndCooldowns

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

syringe_gun.dm

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00