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

Conflicts:
	code/game/mecha/mecha.dm

2014-08-06 15:22:56 -07:00

..

collectable.dm

…

hardhat.dm

Fix hardhat sprite not updating

2014-06-11 20:11:10 +02:00

helmet.dm

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

2014-08-06 15:22:56 -07:00

jobs.dm

armor

2014-07-14 12:44:38 -07:00

misc_special.dm

Various mineral/material standardizations, minor mob changes

2014-03-19 18:28:56 -07:00

misc.dm

Changed the replica suit/helmet to the black/red version.

2014-03-29 12:42:23 +00:00

soft_caps.dm

armor

2014-07-14 12:44:38 -07:00