Leshana 4fbfa7ee37 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08 ...

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

2017-05-08 21:07:45 -04:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

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

general

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-04 20:25:00 -04:00

global

Implements browser streaming media jukeboxes

2017-03-23 21:10:11 -04:00

loadout

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

occupation

Late September Sync (#579)

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

skills

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

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

vore

Fixes an issue with tails

2017-04-27 22:35:41 +01: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