Merge branch 'master' of https://github.com/space-syndicate/space-station-14 into OhShitUstreamAgain

Content.Shared/Preferences/Loadouts/RoleLoadout.cs

@@ -123,7 +123,6 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
             }
 
             // Corvax-Loadouts-Start
-            var groupProtoLoadouts = groupProto.Loadouts;
             if (collection.TryResolveType<ISharedLoadoutsManager>(out var loadoutsManager) && group.Id == "Inventory")
             {
                 var prototypes = new List<string>();
@@ -136,7 +135,7 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
                     prototypes = protos;
                 }
 
-                groupProtoLoadouts = prototypes.Select(id => (ProtoId<LoadoutPrototype>)id).ToList();
+                groupProto.Loadouts.AddRange(prototypes.Select(id => (ProtoId<LoadoutPrototype>)id));
             }
             // Corvax-Loadouts-End
 
@@ -176,7 +175,7 @@ public sealed partial class RoleLoadout : IEquatable<RoleLoadout>
             // If you put invalid ones first but that's your fault for not using sensible defaults
             if (loadouts.Count < groupProto.MinLimit)
             {
-                foreach (var protoId in groupProtoLoadouts) // Corvax-Loadout: Use groupProtoLoadouts instead of groupProto.Loadouts
+                foreach (var protoId in groupProto.Loadouts)
                 {
                     if (loadouts.Count >= groupProto.MinLimit)
                         break;

Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json

@@ -5,7 +5,7 @@
     "y": 32
   },
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law', 'psychology', 'eva' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison; Job signs localized by kaiserGans (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'ntmining' modified by Ko4erga, 'corvax_newyear' by Ko4erga, 'direction_pods' derived by WarPigeon from existing directional signs.",
+  "copyright": "Taken from https://github.com/discordia-space/CEV-Eris at commit 4e0bbe682d0a00192d24708fdb7031008aa03f18 and bee station at commit https://github.com/BeeStation/BeeStation-Hornet/commit/13dd5ac712385642574138f6d7b30eea7c2fab9c, Job signs by EmoGarbage404 (github) with inspiration from yogstation and tgstation, 'direction_exam' and 'direction_icu' made by rosieposieeee (github). 'court', 'janitor', 'law', 'psychology', 'eva' changed for corvax by netwy (discord, 583844759429316618) and updated by github:lapatison; Job signs localized by kaiserGans (github), 'direction_atmos' made by SlamBamActionman. voxcross taken from vgstation13 at https://github.com/vgstation-coders/vgstation13/blob/e7f005f8b8d3f7d89cbee3b87f76c23f9e951c27/icons/obj/decals.dmi, 'ntmining' modified by Ko4erga, 'corvax_newyear' by Ko4erga, 'direction_pods' derived by WarPigeon from existing directional signs, 'cans_sci' by @mishutka09 (discord:1152277579206774854), 'bath' by NotSoDamn (github)",
     "states": [
         {
             "name": "ai"