PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning ...

Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm

2015-04-24 17:13:37 +02:00

..

client defines.dm

…

client procs.dm

Merge remote-tracking branch 'upstream/dev' into TheSummoning

2015-04-24 17:13:37 +02:00

preferences_factions.dm

…

preferences_gear.dm

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

2015-04-08 10:40:38 +02:00

preferences_savefile.dm

Merge with dev.

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

preferences_spawnpoints.dm

…

preferences_toggles.dm

…

preferences.dm

Merge with dev.

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