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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme

2017-10-17 08:49:37 -04:00

..

preference_setup

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

2017-10-17 08:49:37 -04: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

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

Add a verb to the Preferences panel to toggle jukebox music.

2017-03-27 20:31:15 -04:00

preferences_vr.dm

Slight charstomization overhauls.

2017-07-13 00:20:02 +03:00

preferences.dm

HOTFIX

2017-09-21 20:26:48 -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