Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

ammo_casings.dm

Merge remote-tracking branch 'remotes/upstream/master' into thaw

2015-06-18 23:37:06 -04:00

boxes.dm

Removed dangerous "hacked" foam darts, as they were a little more powerful than intended. Hopefully this is something I can fix at a later date. Fixed non-magazine ammo boxes not accepting their correct ammo type. Added a speed collection system to all ammo boxes. Finally balanced out the cargo ordering stuff.

2015-03-20 23:19:04 +00:00

energy.dm

DRAGnet lives!

2015-06-15 23:55:28 -05:00

magazines.dm

Merge remote-tracking branch 'remotes/upstream/master' into thaw

2015-06-19 11:23:45 -04:00

special.dm

changes syndicate borg equipment

2015-01-05 19:42:31 -08:00