Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	vorestation.dme

2018-01-19 17:52:25 -05:00

..

gear_tweaks.dm

…

loadout_accessories_vr.dm

Adds yet another new loadout accessory.

2017-11-22 22:56:38 +02:00

loadout_accessories.dm

Polaris sync

2017-12-21 04:01:07 -05:00

loadout_cosmetics.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout_ears.dm

…

loadout_eyes_vr.dm

Unrestricts my fluff goggles for general loadout use.

2017-11-16 09:31:27 +02:00

loadout_eyes.dm

PsychHUD!

2017-12-04 00:05:10 +00:00

loadout_general.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout_gloves_vr.dm

…

loadout_gloves.dm

Loadout stuff, but done right! (#4094)

2017-10-19 09:36:15 -05:00

loadout_head_vr.dm

Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)

2017-09-06 15:55:16 +03:00

loadout_head.dm

Polaris sync

2017-12-21 04:01:07 -05:00

loadout_mask.dm

…

loadout_shoes_vr.dm

Add legwraps to loadout shoes list

2017-12-27 14:49:32 -05:00

loadout_shoes.dm

Removes some loadout items that have colorable versions. (#4173)

2017-11-01 22:19:20 -05:00

loadout_smoking.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout_suit_vr.dm

adds gn set

2017-11-22 23:53:59 +02:00

loadout_suit.dm

Removes the military clothing from the loadout, repaths things

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

loadout_uniform_vr.dm

Updates paths due to Polaris change

2017-12-25 22:31:01 -05:00

loadout_uniform.dm

Merge pull request #4384 from Belsima/maid

2017-12-12 19:51:35 -06:00

loadout_utility.dm

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

2018-01-19 17:52:25 -05:00

loadout_xeno_vr.dm

Adds a loincloth to the xeno loadout

2017-09-11 21:18:29 -04:00

loadout_xeno.dm

Loadout additions + fixes. (#4339)

2017-11-27 19:21:49 -06:00

loadout.dm

Multiple loadout slots (#4530)

2018-01-14 14:47:47 -06:00