Shadowlight213 ce01058e7c Fixes merge conflicts

2016-05-27 15:36:56 -07:00

..

asset_cache.dm

Kills PDA snowflakey close button

2016-03-21 07:38:33 +03:00

client_colour.dm

Adds a priority system for client.color effects

2016-04-07 21:55:31 +01:00

client_defines.dm

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

client_procs.dm

Renames files under code/ with naughty characters

2016-05-24 12:16:19 +01:00

message.dm

Cleans up isbanned() and stickyban handling

2015-09-26 23:30:26 -07:00

preferences_savefile.dm

Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)

2016-05-14 00:55:50 +02:00

preferences_toggles.dm

Fixes announcement prefs, fixes SOUND_ANNOUNCEMENTS (#17626)

2016-05-14 00:55:50 +02:00

preferences.dm

Conflict fixes

2016-05-19 20:42:26 -07:00