paprka 615f3f3488 Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd ...

Conflicts:
	code/modules/mob/living/damage_procs.dm
	code/modules/projectiles/projectile.dm

2014-12-26 16:14:19 -08:00

..

ammunition

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

2014-12-24 18:56:26 -08:00

guns

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

2014-12-25 13:51:43 -08:00

projectile

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

2014-12-26 16:14:19 -08:00

ammunition.dm

* fixes #3765 (shotguns sawing off)

2014-12-21 01:35:49 +01:00

firing.dm

* fixes #3765 (shotguns sawing off)

2014-12-21 01:35:49 +01:00

gun.dm

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

2014-12-25 13:51:43 -08:00

projectile.dm

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

2014-12-26 16:14:19 -08:00