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

# Conflicts:
#	.gitignore
#	vorestation.dme

2017-02-18 09:40:18 -05:00

..

preference_setup

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync

2017-02-14 20:29:57 -05:00

client defines.dm

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

2016-09-10 00:54:59 -04:00

client procs.dm

Fixed mute issues and map stairs issues

2017-01-28 00:14:04 -05:00

movement.dm

…

preferences_factions.dm

…

preferences_savefile.dm

Ports Bay's character resets

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

preferences_spawnpoints.dm

…

preferences_toggle_procs.dm

…

preferences_vr.dm

…

preferences.dm

Polaris sync

2017-02-01 15:08:45 -05:00

spam_prevention.dm

Makes the automute less strict on timing

2017-01-14 23:06:24 -06:00

ui_style.dm

…