Anewbe 25b925f04c Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots ...

# Conflicts:
#	maps/northern_star/polaris-1.dmm
#	maps/northern_star/polaris-2.dmm

2017-03-02 16:53:29 -06:00

..

preference_setup

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

2017-03-02 16:53:29 -06:00

client defines.dm

…

client procs.dm

…

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

…

preferences_spawnpoints.dm

…

preferences_toggle_procs.dm

…

preferences.dm

Merge pull request #2934 from Anewbe/char_reset

2017-01-27 20:44:54 -06:00

spam_prevention.dm

…

ui_style.dm

…