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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt

2018-08-17 19:13:15 -04:00

..

preference_setup

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

2018-08-17 19:13:15 -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

Ports Bay's character resets

2017-01-16 19:02:41 -06:00

preferences_spawnpoints.dm

Polaris Sync

2017-08-28 20:52:11 -04:00

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 an option to enable/disable markings on synth parts.

2018-07-08 17:36:41 -04:00

spam_prevention.dm

Makes automute less prone to mute cultists.

2017-07-04 23:20:44 -04:00

ui_style.dm

POLARIS: Tooltip framework, and mob tooltips

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