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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -05:00

..

preference_setup

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

2018-02-02 19:25:51 -05:00

client defines.dm

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

2018-02-02 19:25:51 -05:00

client procs.dm

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

2018-02-02 19:25:51 -05:00

movement.dm

…

preferences_factions.dm

Fixes up the PR.

2017-09-09 23:17:41 -04:00

preferences_savefile.dm

…

preferences_spawnpoints.dm

Polaris Sync

2017-08-28 20:52:11 -04:00

preferences_toggle_procs.dm

…

preferences_vr.dm

Fixes character setup preview backround changing.

2018-01-17 18:15:24 -05:00

preferences.dm

Merge polaris sync 01 17 2018

2018-01-17 17:56:51 -05:00

spam_prevention.dm

…

ui_style.dm

Adds a new hud & removes red crosses from huds. (#3846)

2017-09-17 19:07:32 -05:00