Repede 2b21dbfd99 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self ...

# Conflicts:
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	maps/tether/tether-05-station1.dmm
#	maps/tether/tether-06-station2.dmm

2018-06-23 17:53:13 -04:00

..

preference_setup

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2018-06-23 17:53:13 -04:00

client defines.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-06-02 18:33:44 -04:00

client procs.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation

2018-06-02 18:33:44 -04:00

movement.dm

…

preferences_factions.dm

Fixes up the PR.

2017-09-09 23:17:41 -04:00

preferences_savefile.dm

…

preferences_spawnpoints.dm

…

preferences_toggle_procs.dm

Merge pull request #5093 from Neerti/3/21/2018_typing_fix

2018-03-23 21:40:00 -05:00

preferences_vr.dm

Preview background fixes and additions.

2018-02-20 09:52:56 +02:00

preferences.dm

Adds a client FPS setting

2018-05-07 23:37:47 -04:00

spam_prevention.dm

…

ui_style.dm

POLARIS: Tooltip framework, and mob tooltips

2018-03-20 22:42:16 -04:00