LetterJayandGitHub 7c3c270e2a Merge branch 'master' into upstream-merge-37749

2018-05-15 00:50:13 -05:00

..

verbs

Update suicide.dm

2018-05-02 10:01:47 -04:00

asset_cache.dm

Merge pull request #37851 from AutomaticFrenzy/patch/jquery-tooltips-2

2018-05-14 16:51:20 -05: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

Merge pull request #36829 from MrStonedOne/onclick_rework

2018-04-01 08:24:12 -05:00

client_procs.dm

Merge pull request #6673 from Citadel-Station-13/kevinz000-patch-2

2018-05-07 09:20:59 -05:00

message.dm

…

player_details.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

preferences_savefile.dm

Merge pull request #6663 from Citadel-Station-13/upstream-merge-37646

2018-05-15 00:47:59 -05: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

Merge branch 'master' into upstream-merge-37749

2018-05-15 00:50:13 -05:00