Verkister b936f72d9a Merge branch 'master' of https://github.com/VOREStation/VOREStation into blehh ...

# Conflicts:
#	code/modules/vore/appearance/sprite_accessories_vr.dm
#	icons/mob/vore/tails_vr.dmi

2017-07-18 11:05:33 +03:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

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

general

Don't sanitize out Custom Species unless they are changing species

2017-05-29 17:19:03 -04:00

global

Convert to using Mediamanager lobby music

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

loadout

Fixes code up.

2017-07-13 17:12:46 -04:00

occupation

Late September Sync (#579)

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

skills

…

vore

Slight charstomization overhauls.

2017-07-13 00:20:02 +03: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