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

..

ammo_casings.dm

changes to the uplink and further c90 updates

2014-12-07 19:39:24 -08:00

boxes.dm

Generic names and buffs

2014-12-08 16:49:48 -08:00

energy.dm

initial commit for nerfing ranged stuns

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

magazines.dm

Generic names and buffs

2014-12-08 16:49:48 -08:00

special.dm

Initial pass to convert LF to CRLF

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