Joan Lung d41971d7ed Merge branch 'master' of https://github.com/tgstation/tgstation into proofofconceptantagdatum ...

Conflicts:
	code/game/gamemodes/game_mode.dm

2016-09-20 19:03:20 -04:00

..

ai_upgrades.dm

…

robot_items.dm

Arm Combat Cybernetic Implants (because toolset arm shanks weren't enough) (#20544)

2016-09-20 21:36:11 +12:00

robot_parts.dm

"A Working Datum Antagonist"

2016-09-19 13:03:22 -04:00

robot_upgrades.dm

…