bgobandit 899e6ecaf9 Merge branch 'master' of https://github.com/tgstation/-tg-station into newmininggear ...

Conflicts:
	_maps/map_files/DreamStation/dreamstation04.dmm

2015-11-18 19:55:06 -05:00

..

ammo_casings.dm

InitalCommit

2015-10-15 01:51:54 +08: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

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

2015-11-18 19:55:06 -05:00

magazines.dm

InitalCommit

2015-10-15 01:51:54 +08:00

special.dm

changes syndicate borg equipment

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