Fermi 614a462176 Revert "Revert "Merge remote-tracking branch 'upstream/master'"" ...

This reverts commit 1509d9d183.

2019-11-24 03:33:02 +00:00

..

verbs

Revert "Revert "Merge remote-tracking branch 'upstream/master'""

2019-11-24 03:33:02 +00:00

asset_cache.dm

final fixes.

2019-09-12 04:11:44 +02:00

client_colour.dm

Adds the Family Heirloom, Nyctophobia, and Monochromacy traits, and rebalances Social Anxiety (#36426)

2018-03-28 12:15:06 -05:00

client_defines.dm

[s] ports tgstation/tgstation#46425

2019-09-11 19:24:05 -04:00

client_procs.dm

Revert "PLASE"

2019-11-24 03:06:08 +00:00

darkmode.dm

Fixing and testing themes.

2019-09-11 23:30:04 +02:00

message.dm

April sync (#360)

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

player_details.dm

Alien Ruin fix, various cherrypicked upstream fixes

2018-09-13 22:55:11 -05:00

preferences_savefile.dm

Revert "PLASE"

2019-11-24 03:06:08 +00:00

preferences_toggles.dm

[MIRROR] Adds missing space to lobby music toggle (#6010)

2018-03-19 21:07:36 -05:00

preferences_vr.dm

Vore code to json and more (#5789)

2018-03-06 03:59:31 -06:00

preferences.dm

Revert "Revert "Merge remote-tracking branch 'upstream/master'""

2019-11-24 03:33:02 +00:00