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

# Conflicts:
#	code/modules/mining/machine_stacking.dm
#       Resolved
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm #       Resolved mostly besides line 717 "plasteel: undefined var"
#       even though the only change in this line is removing the comment
#	icons/mob/widerobot_vr.dmi
#       Resolved
#	maps/tether/tether-07-station3.dmm
#       Resolved

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

..

gear_tweaks_vr.dm

Fixes Collars Not Spawning

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

gear_tweaks.dm

Fixes bug with custom laptops/tablets

2019-05-09 13:05:54 -04:00

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

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_eyes.dm

Merge remote-tracking branch 'upstream/master'

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

loadout_fluffitems_vr.dm

Fluff Item Fixy

2019-12-10 09:41:00 -05:00

loadout_fluffitems_yw.dm

does the thing, and another thing

2020-01-20 13:44:02 -05:00

loadout_general.dm

…

loadout_gloves_vr.dm

Changes wedding rings to be a subtype of ring

2018-04-08 01:06:36 -04:00

loadout_gloves.dm

Yet Another Circuit Update (#5549)

2018-09-12 20:51:32 -05:00

loadout_head_vr.dm

…

loadout_head.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

loadout_mask.dm

…

loadout_shoes_vr.dm

Code cleanup

2018-11-18 14:28:40 -05:00

loadout_shoes.dm

Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

2019-04-07 19:40:12 -04:00

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.dm

Fixed blizzard so animals do not get killed

2019-11-24 16:57:06 -05: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

Merge remote-tracking branch 'upstream/master'

2018-12-09 19:45:43 +00:00

loadout_utility.dm

Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor

2019-10-29 20:34:36 -04: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

Merge pull request #4801 from VOREStation/upstream-merge-5974

2019-03-28 21:09:51 -04:00

loadout.dm

Fixes loadout index runtime spam (#6626)

2020-01-16 02:56:04 -05:00