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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt

2017-11-25 11:49:28 -05:00

..

preference_setup

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

2017-11-25 11:49:28 -05:00

client defines.dm

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

2017-06-18 15:35:35 -04:00

client procs.dm

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

2017-08-18 08:14:12 -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

Polaris Sync

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

preferences_toggle_procs.dm

…

preferences_vr.dm

Preview nitpickery.

2017-11-05 22:21:20 +02:00

preferences.dm

Polaris sync

2017-10-27 15:30:24 -04:00

spam_prevention.dm

Makes automute less prone to mute cultists.

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

ui_style.dm

Adds a new hud & removes red crosses from huds. (#3846)

2017-09-17 19:07:32 -05:00