Arokha Sieyes d100c30821 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync ...

# Conflicts:
#	html/changelogs/.all_changelog.yml
#	icons/mob/hud.dmi
#	maps/polaris-1.dmm

Fake conflicts from a merge error previously. No real conflicts.

2016-11-04 15:42:32 -04:00

..

antagonism

Adds fluff antag factions, antag visibility options for uplinks.

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

general

OOC sanitize like Flavor sanitize

2016-10-18 11:52:28 -04:00

global

Scheduler now uses btime, and other improvements

2016-06-01 17:56:07 +01:00

loadout

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into novearlysync

2016-11-04 15:42:32 -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

Allow unsetting custom species (Fixes #540) (#544)

2016-09-11 20:42:09 -04:00

_defines.dm

Can now toggle loadout and job preview equipment separately.

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

preference_setup.dm

no message

2016-08-05 17:58:15 +01:00