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

# Conflicts:
#	code/game/objects/items/weapons/tools.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	config/custom_items.txt
#	vorestation.dme

2017-10-17 08:49:37 -04:00

..

antagonism

…

general

Pol Sync

2017-10-08 17:44:25 -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-10-17 08:49:37 -04:00

occupation

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

skills

…

vore

Makes neutral traits not take trait slots

2017-09-30 13:35:25 -04:00

_defines.dm

Can now toggle loadout and job preview equipment separately.

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

preference_setup.dm

Adds Body Markings

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