LetterJay 52fa1f314f Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

..

verbs

Merge branch 'master' into upstream-merge-26760

2017-05-14 01:02:26 -04:00

asset_cache.dm

Fixes changelog assets

2017-04-27 15:38:42 -05:00

client_colour.dm

Tg patch branch to master (#192)

2017-02-03 05:56:14 -06:00

client_defines.dm

even more client fixes! this time with added admin fixes

2017-05-12 09:52:42 -05:00

client_procs.dm

this is kenzie's fault

2017-05-12 15:25:11 -05:00

client_procs.dm.rej

rej cleanup

2017-05-10 22:35:01 -05:00

message.dm

April sync (#360)

2017-04-13 23:37:00 -05:00

preferences_savefile.dm

Fixes character saves getting fucked up if there are no configured round start races. (#742)

2017-05-11 19:24:59 -07:00

preferences_toggles.dm

[READY]DATUM VERBS AND TOP MENUS!

2017-05-07 17:07:59 -05:00

preferences_vr.dm

adds vore back (why this was removed, I have no idea)

2017-04-14 13:40:44 -05:00

preferences.dm

rej fix

2017-05-10 21:59:41 -05:00