CPTANT 086dd558f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into laserfire ...

# Conflicts:
#	code/game/gamemodes/malfunction/Malf_Modules.dm

2016-02-16 03:23:55 +01:00

..

tools

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

2016-02-08 08:50:44 -06:00

weapons

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

2016-02-16 03:23:55 +01:00

mecha_equipment.dm

Adds Mecha Pilots! Syndicate soldiers who can pilot Mecha and use that Mecha's abilities and equipment.

2016-01-24 21:04:18 +00:00