Mark9013100 3cc7a77846 The detective colt can now be reskinned ...

Conflicts:
	code/modules/projectiles/guns/projectile/pistol.dm

2015-10-11 00:30:06 -04:00

..

ammunition

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

guns

The detective colt can now be reskinned

2015-10-11 00:30:06 -04:00

projectile

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

ammunition.dm

Adds SLOT_EARS to various items

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

effects.dm

Projectile visual bug fixes

2015-07-11 00:06:44 +12:00

gun.dm

Merge pull request #11208 from mwerezak/firemode-cleanup

2015-09-28 11:41:03 +01:00

projectile.dm

Merge pull request #10672 from mwerezak/frag-grenade

2015-09-07 14:12:27 +09:30

targeting.dm

fixes #8391

2015-07-09 13:23:13 -07:00