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

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/gun.dmi

2014-12-10 23:55:51 -08:00

..

ammunition

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

2014-12-10 23:55:51 -08:00

guns

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

2014-12-10 23:55:51 -08:00

projectile

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

2014-12-10 23:55:51 -08: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

second commit for c90gls

2014-12-05 18:13:04 -08:00

projectile.dm

initial commit for nerfing ranged stuns

2014-12-10 00:16:53 -08:00