paprka 4a0aa0c0a5 Merge branch 'master' of https://github.com/tgstation/-tg-station into nosenseofrightandwrongiguess ...

Conflicts:
	code/game/gamemodes/wizard/rightandwrong.dm
	code/modules/projectiles/ammunition/ammo_casings.dm
	code/modules/projectiles/ammunition/boxes.dm
	icons/obj/ammo.dmi
	icons/obj/gun.dmi

2015-01-15 22:16:11 -08:00

..

ammunition

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

2015-01-15 22:16:11 -08:00

guns

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

2015-01-15 22:16:11 -08:00

projectile

crossbow, speargun, and grenade updates

2015-01-13 20:00:58 -08:00

ammunition.dm

further changes to the ranged stun system

2015-01-01 22:22:03 -08: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 pinned

2015-01-15 16:14:27 -06:00

pins.dm

Update pins.dm

2015-01-13 02:57:08 -06:00

projectile.dm

Merge pull request #6207 from phil235/RecursiveHearVisibleMessage

2014-12-27 13:20:50 +01:00