Razharas f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit ...

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

ammunition

Merge pull request #6341 from paprka/gunspritefix

2014-12-14 23:26:36 -06:00

guns

trims some unnecessary code

2014-12-10 22:56:52 -08:00

projectile

Movin' house

2014-12-11 21:23:15 +00:00

ammunition.dm

commit for grenade launcher moving

2014-12-08 00:30:10 -08:00

firing.dm

Removes the spawn() in the Bump() proc of projectiles.

2014-11-04 15:21:48 -03:00

gun.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

projectile.dm

Removes the spawn() in the Bump() proc of projectiles.

2014-11-04 15:21:48 -03:00