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

# Conflicts:
#	maps/virgo-1.dmm

2016-12-28 17:31:26 -05:00

..

preference_setup

Polaris sync

2016-12-27 08:21:55 -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

Polaris sync

2016-08-06 20:34:44 -07:00

movement.dm

…

preferences_factions.dm

Cleans up the code to match recent Tajaran rewrite

2016-08-13 23:07:00 -05:00

preferences_savefile.dm

…

preferences_spawnpoints.dm

…

preferences_toggle_procs.dm

…

preferences_vr.dm

Desc

2016-05-08 17:06:00 -04:00

preferences.dm

Polaris sync

2016-08-06 20:34:44 -07:00

ui_style.dm

…