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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

2018-01-24 19:52:12 -05:00

..

antagonism

…

general

Merge polaris sync 01 17 2018

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

global

Convert to using Mediamanager lobby music

2017-05-08 02:33:46 -04:00

loadout

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

2018-01-24 19:52:12 -05:00

occupation

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

skills

…

traits

Polaris sync

2017-12-21 04:01:07 -05:00

vore

Fixes a couple of charsetup sanitizes

2018-01-05 12:28:15 -05:00

_defines.dm

…

preference_setup.dm

Polaris Sync

2017-10-16 22:16:24 -04:00