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

# Conflicts:
#	.gitignore
#	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm

2016-12-11 13:41:38 -05:00

..

preference_setup

Polaris December Sync

2016-12-10 09:51:11 -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

Fixes preferences typo

2016-05-03 14:40:57 -05:00

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

Allows robots to change UI style.

2016-04-29 22:40:27 -04:00