Markolie 8ad7eb56c2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into hotkeys2 ...

Conflicts:
	config/example/config.txt

2015-09-30 01:04:45 +02:00

..

client defines.dm

Hotkey/interface update

2015-09-30 01:02:58 +02:00

client procs.dm

Re-add ban appeal message, memo check

2015-09-27 09:08:10 +02:00

global_cache.dm

Add syndicate stamp

2015-08-30 22:52:31 +02:00

message.dm

Add in-game stickyban interface

2015-09-27 09:02:58 +02:00

preferences_mysql.dm

Fixes

2015-09-27 22:50:09 +02:00

preferences_savefile.dm

Sock port

2015-08-21 17:43:16 -04:00

preferences_spawnpoints.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

preferences_toggles.dm

Instrument toggle fix

2015-09-24 18:19:15 +02:00

preferences.dm

Fix exploit, refactor access to body color,

2015-09-29 08:52:20 -07:00