Markolie c1b48b40b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise ...

Conflicts:
	code/modules/client/preferences.dm

2015-01-06 23:40:34 +01:00

..

client defines.dm

adv. hotkey mode code + AZERTY support

2014-12-28 15:26:32 +01:00

client procs.dm

Talisman image

2014-12-21 16:38:23 +01:00

preferences_mysql.dm

Old vox choice

2014-12-17 14:18:57 +01:00

preferences_savefile.dm

First commit converting playerfiles to MySQL

2014-06-02 22:02:15 -04:00

preferences_toggles.dm

More verb fixes

2015-01-06 22:46:11 +01:00

preferences.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

2015-01-06 23:40:34 +01:00