paprka 2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns ...

Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi

2014-10-19 17:30:47 -07:00

..

ammo_casings.dm

initial commit

2014-10-15 13:29:19 -07:00

boxes.dm

whole bunch of gun stuff

2014-08-07 14:39:31 -07:00

energy.dm

Turret SFX and spawning changes

2014-10-07 16:44:51 -04:00

magazines.dm

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

2014-10-19 17:30:47 -07:00

special.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00