Repede 4cf7f71be6 Merge branch 'release' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/game/objects/items/weapons/stunbaton.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/events/event_container_vr.dm
#	code/modules/mining/ore_box.dm
#	code/modules/paperwork/paper.dm
#	code/modules/rogueminer_vr/zone_console.dm
#	config/custom_items.txt
#	icons/mob/items/lefthand_suits.dmi
#	icons/mob/items/righthand_suits.dmi
#	icons/mob/species/vulpkanin/helmet.dmi
#	icons/mob/species/vulpkanin/suit.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/suits.dmi
#	maps/tether/tether_defines.dm

2020-02-22 12:38:04 -05:00

..

gear_tweaks_vr.dm

Fixes Collars Not Spawning

2019-11-25 21:16:26 -05:00

gear_tweaks.dm

…

loadout_accessories_vr.dm

remove kh

2020-01-22 03:03:34 -05:00

loadout_accessories.dm

Merge remote-tracking branch 'upstream/master'

2019-07-07 18:41:28 +01:00

loadout_cosmetics.dm

…

loadout_ears.dm

Ports Earrings from Baystation

2019-09-25 17:09:11 -04:00

loadout_eyes_vr.dm

…

loadout_eyes_yw.dm

quickfix

2020-02-17 21:49:36 +00:00

loadout_eyes.dm

Merge remote-tracking branch 'upstream/master'

2019-12-29 19:01:58 +00:00

loadout_fluffitems_vr.dm

Fluff items and species whitelisting

2020-02-18 00:27:36 +00:00

loadout_fluffitems_yw.dm

Resetting master

2020-02-22 12:28:01 -05:00

loadout_general.dm

Merge pull request #6664 from PrismaticGynoid/loadouttoys

2020-02-03 20:50:45 -05:00

loadout_gloves_vr.dm

…

loadout_gloves.dm

…

loadout_head_vr.dm

…

loadout_head_yw.dm

add new clothes

2020-02-05 21:50:32 +00:00

loadout_head.dm

…

loadout_mask.dm

…

loadout_shoes_vr.dm

…

loadout_shoes.dm

…

loadout_smoking.dm

Fixes some personal fluff items being selectable in loadout

2019-07-05 09:58:27 +10:00

loadout_suit_vr.dm

Update loadout_suit_vr.dm

2020-01-11 17:07:29 +01:00

loadout_suit_yw.dm

add new clothes

2020-02-05 21:50:32 +00:00

loadout_suit.dm

fashion attack 2: jackets

2020-02-19 22:45:01 +00:00

loadout_uniform_vr.dm

Map Updates.

2019-10-04 01:52:44 +01:00

loadout_uniform_yw.dm

…

loadout_uniform.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into izac-update

2020-01-31 18:23:50 +01:00

loadout_utility_vr.dm

…

loadout_utility.dm

edit comments

2020-02-16 06:34:09 +00:00

loadout_vr.dm

Reworks things. Closer to intended functionality. Adds paths to all items, restrictions.

2019-09-11 02:45:55 -05:00

loadout_xeno_vr.dm

Adds taur cloak and dress to loadout

2020-01-11 11:33:58 +10:00

loadout_xeno.dm

…

loadout.dm

Deprecate the stream operator

2020-02-12 19:38:43 -05:00