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

# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme

2017-05-24 13:46:58 -04:00

..

preference_setup

Fixes Runtime in 04_resleeving.dm,32: Cannot read null.ckey

2017-05-23 01:14:56 -04:00

client defines.dm

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

2016-09-10 00:54:59 -04:00

client procs.dm

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

2017-04-18 19:25:46 -04:00

movement.dm

add verbs to allow players to spin their view

2015-12-05 10:52:29 +00:00

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

Remove elevator spawn point

2017-05-20 22:26:08 -04:00

preferences_toggle_procs.dm

Add a verb to the Preferences panel to toggle jukebox music.

2017-03-27 20:31:15 -04:00

preferences_vr.dm

Desc

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

preferences.dm

Adds Body Markings

2017-03-30 18:05:20 -04:00

spam_prevention.dm

Makes the automute less strict on timing

2017-01-14 23:06:24 -06:00

ui_style.dm

Allows robots to change UI style.

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