Leshana f53dfde515 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06 ...

# Conflicts:
#	code/game/objects/items/blueprints.dm
#	vorestation.dme

2017-03-06 20:58:38 -05:00

..

preference_setup

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sync-2017-03-06

2017-03-06 20:58:38 -05:00

client defines.dm

…

client procs.dm

Polaris sync

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

movement.dm

…

preferences_factions.dm

Ports a large chunk of the map datum system that europa/bay uses.

2017-02-27 07:36:41 -05:00

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

…