Artur 5b7d9a9008 Merge conflict fix

2020-05-13 12:37:18 +03:00

..

verbs

Ports "Makes raw HTML and browser datum popups UTF-8 aware"

2020-03-27 22:52:43 +01:00

asset_cache_client.dm

Ports https://github.com/tgstation/tgstation/pull/44525, and

2020-04-23 17:36:13 +03:00

asset_list_items.dm

Ports https://github.com/tgstation/tgstation/pull/44525, and

2020-04-23 17:36:13 +03:00

client_colour.dm

New traumas and some other things.

2019-10-08 03:53:01 -04:00

client_defines.dm

Runechat Port (#12065)

2020-05-03 03:53:19 +02:00

client_procs.dm

Ports https://github.com/tgstation/tgstation/pull/44525, and

2020-04-23 17:36:13 +03:00

darkmode.dm

Fixing and testing themes.

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

message.dm

Ported

2020-01-13 13:20:55 +02:00

player_details.dm

…

preferences_savefile.dm

Merge pull request #12196 from Citadel-Station-13/Ghommie-patch-1

2020-05-11 04:18:29 -07:00

preferences_toggles.dm

Standardises all files from CRLF to LF

2020-01-12 14:28:01 +00:00

preferences_vr.dm

…

preferences.dm

Adds OOC notes (#12067)

2020-05-11 01:35:48 +02:00