Kelshark c048a8ea8b Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/vore/weight/fitness_machines_vr.dm
#	config/custom_items.txt

2018-02-02 19:25:51 -05:00

..

gear_tweaks.dm

Underwear + setup merges (#1812)

2016-05-30 19:19:45 +01:00

loadout_accessories_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05: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

Makes translators more expensive

2017-03-26 17:36:36 -05:00

loadout_eyes_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05: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 path fix

2017-04-10 20:55:24 -04:00

loadout_gloves.dm

Loadout stuff, but done right! (#4094)

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

loadout_head_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05: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

Loadout capitalization fixes

2018-01-31 20:31:41 -05:00

loadout_uniform_yw.dm

Smoll fixes to hueg ass update & merge

2018-01-24 21:04:12 -05:00

loadout_uniform.dm

Merge pull request #4384 from Belsima/maid

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

loadout_utility_vr.dm

Loadout capitalization fixes

2018-01-31 20:31:41 -05:00

loadout_utility.dm

Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27

2018-01-27 23:08:53 -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