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

# Conflicts:
#	code/modules/mob/living/silicon/robot/dogborg/dog_modules_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules_vr.dm
#	config/custom_items.txt

2017-11-25 11:49:28 -05:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

2016-06-29 11:25:52 -04:00

general

Polaris Sync

2017-11-04 13:37:13 -04: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

2017-11-25 11:35:10 -05:00

occupation

Polaris Sync

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

skills

Move preferences copy_to() new player mobs into the preference_setup datums.

2016-06-11 23:33:48 -04:00

traits

Polaris sync

2017-11-17 19:27:03 -05:00

vore

Fixes my lossed updoots.

2017-11-18 17:39:00 +02:00

_defines.dm

Can now toggle loadout and job preview equipment separately.

2016-07-10 04:53:49 +01:00

preference_setup.dm

Polaris Sync

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