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

# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi

2018-02-24 22:51:59 -05:00

..

gear_tweaks.dm

…

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

Removes several ways to know every language

2018-02-04 13:03:49 -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

Adds Siren jumpsuit

2018-02-22 06:00:41 -06: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

Adds Siren jumpsuit

2018-02-22 06:00:41 -06: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

Department ponchos for all

2018-02-15 16:26:55 -08:00

loadout_uniform_vr.dm

Adds Siren jumpsuit

2018-02-22 06:00:41 -06: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-02-07

2018-02-07 19:30:50 -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