skull132 179431115b Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import ...

# Conflicts:
#	code/modules/admin/admin.dm
#	code/modules/admin/admin_verbs.dm

All conflicts cleared. Wind funciton needs a quick redo as a result.

2016-02-01 16:00:54 +02:00

..

client defines.dm

SQL based player whitelisting

2016-02-01 15:34:24 +02:00

client procs.dm

Merge remote-tracking branch 'Aurorastation/development' into SQL-backend-import

2016-02-01 16:00:54 +02:00

preferences_ambience.dm

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00

preferences_factions.dm

Fix Dionea home system

2015-11-22 20:34:29 -06:00

preferences_gear.dm

Gear loadout sanity checking.

2015-12-09 12:27:41 +01:00

preferences_savefile.dm

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00

preferences_spawnpoints.dm

…

preferences_toggles.dm

…

preferences.dm

Footstep Sounds + ASFX Tab

2016-01-14 18:28:09 -05:00