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

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/prometheans.dm
#	code/modules/mob/living/carbon/human/species/station/seromi.dm
#	code/modules/mob/living/silicon/robot/robot_modules.dm
#	config/custom_items.txt
#	icons/obj/gun.dmi
#	maps/virgo-1.dmm
#	vorestation.dme

2017-02-03 21:35:22 -05:00

..

preference_setup

Polaris sync

2017-02-01 15:08:45 -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

Fixed mute issues and map stairs issues

2017-01-28 00:14:04 -05: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

Ports Bay's character resets

2017-01-16 19:02:41 -06:00

preferences_spawnpoints.dm

1.3.0 of Grenades and Elevators

2015-12-11 23:05:15 -08:00

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

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

Allows robots to change UI style.

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