Zuhayr e09a00fe0e Fixed a duplicate definition bug with WHITELISTED. ...

Conflicts:
	code/modules/client/preferences.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/new_player/new_player.dm
	code/setup.dm

2014-01-06 23:59:21 -05:00

..

client defines.dm

Karma System, 1st iteration

2013-08-12 02:04:05 -04:00

client procs.dm

Nano fix

2014-01-06 17:47:24 -05:00

preferences_savefile.dm

Custom HUD colors

2013-11-30 18:30:18 -05:00

preferences_toggles.dm

Vox sound updates

2014-01-03 21:43:40 -05:00

preferences.dm

Fixed a duplicate definition bug with WHITELISTED.

2014-01-06 23:59:21 -05:00