Leshana 4f98fad36b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-02-01 ...

# Conflicts:
#	.travis.yml
#	code/_away_mission_tests.dm
#	code/modules/admin/verbs/mapping.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z10.png
#	nano/images/nanomap_z2.png
#	nano/images/nanomap_z3.png
#	nano/images/nanomap_z5.png
#	nano/images/nanomap_z6.png

2018-02-01 23:55:47 -05:00

..

backpack_vr.dm

Adds dufflebags to loadout.

2018-01-30 13:14:39 +02:00

backpack.dm

Fixes a bug with packing parachutes.

2018-01-29 22:44:53 -06:00

bags.dm

Adds food bags! (#4389)

2017-12-07 17:49:59 -06:00

belt.dm

9mm pistol updates (#4480)

2018-01-14 14:45:15 -06:00

bible.dm

…

boxes.dm

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

2017-12-26 23:07:58 -05:00

briefcase.dm

…

fancy.dm

Removes hypospray/vr and vial/vr

2018-01-18 19:01:26 -05:00

firstaid.dm

Med Pill Blue Pill (#4404)

2017-12-23 14:45:24 -08:00

internal.dm

Polaris sync

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

laundry_basket.dm

Embiggens the laundry baskets

2017-07-23 16:33:02 -05:00

lockbox.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

misc.dm

…

secure.dm

Updates Tools

2017-08-03 04:49:23 -04:00

storage.dm

Planes Framework (#4545)

2018-01-17 13:45:54 -06:00

toolbox.dm

Makes Syndie Toolboxes Special Again

2017-11-18 08:06:38 -05:00

uplink_kits.dm

9mm pistol updates (#4480)

2018-01-14 14:45:15 -06:00

wallets.dm

Repaths permits as accessories

2017-10-03 00:04:58 -05:00