Werner 86a9f5cb48 Merge branch 'upstream-master' into upstream-development

2018-11-04 13:49:40 +01:00

..

preference_setup

Adds Hair Pins (#5474)

2018-11-04 00:29:12 +02:00

asset_cache.dm

[REVIEW ME PLS] Battle Monsters Card Game, or the last* PR. (#5141)

2018-09-02 20:54:27 +03:00

client defines.dm

Removes Topic() rate limiting (#5026)

2018-07-26 21:58:59 +02:00

client procs.dm

Travis Musings (#5116)

2018-11-03 23:36:36 +01:00

client_color.dm

Add new chemicals (#5168)

2018-08-30 20:09:08 +02:00

movement.dm

…

preferences_ambience.dm

VOX toggle fix (#4177)

2018-01-28 13:01:10 +02:00

preferences_factions.dm

New lore stuff (#4848)

2018-06-08 00:35:03 +03:00

preferences_notification.dm

Adds a notification system (#4931)

2018-07-01 22:47:50 +03:00

preferences_savefile.dm

…

preferences_spawnpoints.dm

…

preferences_toggles.dm

Corrected all occurrences of the typo 'recieve'. (#5236)

2018-09-06 19:41:29 +02:00

preferences.dm

Adds additional logging to figure out what causes NULL job entries in the db (#5494)

2018-11-01 11:42:48 +02:00

ui_style.dm

…