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

# Conflicts:
#	code/game/objects/items/weapons/storage/boxes.dm
#	code/game/objects/items/weapons/storage/storage.dm
#	code/modules/mob/living/carbon/human/species/species.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-6.dmm

2018-02-18 00:25:36 -06:00

..

costumes

Improves Halloween costumes, tweaks the admin verb for equipping

2017-10-20 16:01:09 -05:00

jobs

Cleans up references to assistant

2018-01-31 00:55:13 -05:00

military

Removes the military clothing from the loadout, repaths things

2017-12-07 21:21:05 -06:00

_defines.dm

Port Bay's survival boxes

2018-02-16 19:21:15 -06:00

horror_killers.dm

Makes knives all knives.

2018-01-12 18:02:07 -08:00

misc.dm

…

nanotrasen.dm

…

outfit_vr.dm

Pol sync part 2

2017-10-27 15:30:51 -04:00

outfit.dm

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

2018-02-18 00:25:36 -06:00

pirates.dm

…

spec_op.dm

…

tournament.dm

Makes knives all knives.

2018-01-12 18:02:07 -08:00

wizardry.dm

…