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

..

backpack_vr.dm

Removed a ".

2016-07-24 17:29:41 -07:00

backpack.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

bags.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

belt.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

bible.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

boxes.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

briefcase.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

fancy.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

firstaid.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

internal.dm

This fixes a bunch of things so here's each file change and why:

2016-10-20 16:34:34 -04:00

laundry_basket.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

lockbox.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

misc.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

secure.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

storage.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

toolbox.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

uplink_kits.dm

Returns some functionality to the waistcoat, adds cham tie

2016-10-23 00:31:06 -05:00

wallets.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00