PsiOmega 69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm

2015-09-05 09:24:30 +02:00

..

robot_items.dm

Fixes #9063

2015-05-30 05:16:01 +09:30

robot_parts.dm

Merge remote-tracking branch 'upstream/master' into dev-freeze

2015-09-05 09:24:30 +02:00

robot_upgrades.dm

code/game/objects, code/game/machinery merge fix

2015-06-02 20:18:45 +01:00