Leshana 807f1c7b4b Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09 ...

# Conflicts:
#	code/game/objects/items/devices/communicator/UI.dm
#	code/game/objects/structures/flora.dm
#

2018-01-09 14:40:09 -05:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

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

general

Merge remote-tracking branch 'polaris-upstream/master' into polaris-sync-2018-01-09

2018-01-09 14:40:09 -05:00

global

Convert to using Mediamanager lobby music

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

loadout

Add legwraps to loadout shoes list

2017-12-27 14:49:32 -05:00

occupation

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -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 a couple of charsetup sanitizes

2018-01-05 12:28:15 -05: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