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

# Conflicts:
#	code/ATMOSPHERICS/pipes.dm
#	code/game/turfs/flooring/flooring.dm
#	code/modules/clothing/clothing_accessories.dm
#	code/modules/mob/living/carbon/human/inventory.dm
#	html/changelogs/.all_changelog.yml

2018-02-27 21:27:35 -05:00

..

antagonism

…

general

Preview background fixes and additions.

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

global

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-24

2018-02-24 13:19:10 -05:00

loadout

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

2018-02-27 21:27:35 -05:00

occupation

POLARIS: No string compare for assistants

2018-01-30 21:44:00 -05:00

skills

…

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

…

preference_setup.dm

Polaris Sync

2017-10-16 22:16:24 -04:00