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

..

beams.dm

initial commit for nerfing ranged stuns

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

bullets.dm

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

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

energy.dm

Reverts ebow stun nerf, buffs the range

2014-12-10 01:49:46 -08:00

magic.dm

Merge pull request #5679 from Aranclanos/projectilesBump

2014-11-27 03:38:05 +03:00

special.dm

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

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