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

# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt

2018-02-21 22:19:24 -05:00

..

antagonism

…

general

Merge polaris sync 01 17 2018

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

global

…

loadout

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

2018-02-21 22:19:24 -05:00

occupation

POLARIS: No string compare for assistants

2018-01-30 21:44:00 -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