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

..

client defines.dm

…

client procs.dm

Merge with master.

2015-08-18 11:31:10 -07:00

preferences_factions.dm

…

preferences_gear.dm

Update preferences_gear.dm

2015-08-12 12:13:28 -05:00

preferences_savefile.dm

Merge with dev.

2015-03-30 08:36:52 +10:30

preferences_spawnpoints.dm

…

preferences_toggles.dm

…

preferences.dm

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

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