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

# Conflicts:
#	code/modules/multiz/pipes.dm
#	config/custom_items.txt

2018-03-14 18:23:53 -04:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

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

general

Preview background fixes and additions.

2018-02-20 09:52:56 +02:00

global

POLARIS: Tooltip framework, and mob tooltips

2018-03-12 18:25:53 -04:00

loadout

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

2018-03-06 18:11:39 -05:00

occupation

POLARIS: No string compare for assistants

2018-01-30 21:44:00 -05: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-12-21 04:01:07 -05:00

vore

Fixes the cancel button in ears/wings/tail selection clearing the respective selection

2018-03-11 04:29:07 -04: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