Убрал остатки упоминаний корвакса

Content.Client/Lobby/UI/CharacterSetupGui.xaml

@@ -14,12 +14,12 @@
                         Text="{Loc 'character-setup-gui-character-setup-stats-button'}"
                         StyleClasses="ButtonBig"
                         HorizontalAlignment="Right" />
-                <!-- Corvax-Sponsor-Start -->
+                <!-- Sunrise-Sponsor-Start -->
                 <Button Name="SponsorButton"
                         Text="{Loc 'character-setup-gui-character-setup-sponsor-button'}"
                         Visible="False"
                         StyleClasses="ButtonBig" />
-                <!-- Corvax-Sponsor-End -->
+                <!-- Sunrise-Sponsor-End -->
                 <Button Name="RulesButton"
                         Text="{Loc 'character-setup-gui-character-setup-rules-button'}"
                         StyleClasses="ButtonBig"/>

Content.Client/Lobby/UI/HumanoidProfileEditor.xaml

@@ -89,14 +89,14 @@
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="SpawnPriorityButton" HorizontalAlignment="Right" />
                                 </BoxContainer>
-                                <!-- Corvax-TTS-Start -->
+                                <!-- Sunrise-TTS-Start -->
                                 <BoxContainer HorizontalExpand="True" Visible="False" Name="TTSContainer">
                                     <Label Text="{Loc 'humanoid-profile-editor-voice-label'}" />
                                     <Control HorizontalExpand="True"/>
                                     <OptionButton Name="VoiceButton" HorizontalAlignment="Right" />
 									<Button Name="VoicePlayButton" Text="{Loc 'humanoid-profile-editor-voice-play'}" MaxWidth="80" />
                                 </BoxContainer>
-                                <!-- Corvax-TTS-End -->
+                                <!-- Sunrise-TTS-End -->
                             </BoxContainer>
                             <!-- Skin -->
                             <BoxContainer Margin="10" HorizontalExpand="True" Orientation="Vertical">

Content.Client/Research/UI/ResearchConsoleMenu.xaml

@@ -4,7 +4,7 @@
                       xmlns:customControls="clr-namespace:Content.Client.Administration.UI.CustomControls"
                       Title="{Loc 'research-console-menu-title'}"
                       MinSize="625 400"
-                      SetSize="760 550"> <!-- Corvax-Localization -->
+                      SetSize="760 550"> <!-- Russian-Localization -->
     <BoxContainer Orientation="Vertical"
                   HorizontalExpand="True"
                   VerticalExpand="True">

Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml

@@ -12,11 +12,11 @@
             <Label Text="{Loc 'voice-mask-name-change-speech-style'}" />
             <OptionButton Name="SpeechVerbSelector" /> <!-- Populated in LoadVerbs -->
         </BoxContainer>
-        <!-- Corvax-TTS-Start -->
+        <!-- Sunrise-TTS-Start -->
         <BoxContainer Orientation="Horizontal" Margin="5" Visible="False" Name="TTSContainer">
             <Label Text="{Loc 'voice-mask-voice-change-info'}" />
             <OptionButton Name="VoiceSelector" /> <!-- Populated in LoadVerbs -->
         </BoxContainer>
-        <!-- Corvax-TTS-End -->
+        <!-- Sunrise-TTS-End -->
     </BoxContainer>
 </controls:FancyWindow>

Content.Server/Entry/EntryPoint.cs

@@ -1,3 +1,4 @@
+using Content.Server._Sunrise.GuideGenerator;
 using Content.Server._Sunrise.TTS;
 using Content.Server.Acz;
 using Content.Server.Administration;
@@ -6,7 +7,6 @@
 using Content.Server.Afk;
 using Content.Server.Chat.Managers;
 using Content.Server.Connection;
-using Content.Server.Corvax.GuideGenerator;
 using Content.Server.Database;
 using Content.Server.EUI;
 using Content.Server.GameTicking;
@@ -31,6 +31,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 using Robust.Shared.Utility;
+using ReactionJsonGenerator = Content.Server._Sunrise.GuideGenerator.ReactionJsonGenerator;
 
 namespace Content.Server.Entry
 {
@@ -131,7 +132,7 @@ public override void PostInit()
                 file = resourceManager.UserData.OpenWriteText(resPath.WithName("react_" + dest));
                 ReactionJsonGenerator.PublishJson(file);
                 file.Flush();
-                // Corvax-Wiki-Start
+                // Wiki-Start
                 file = resourceManager.UserData.OpenWriteText(resPath.WithName("entity_" + dest));
                 EntityJsonGenerator.PublishJson(file);
                 file.Flush();
@@ -141,7 +142,7 @@ public override void PostInit()
                 file = resourceManager.UserData.OpenWriteText(resPath.WithName("healthchangereagents_" + dest));
                 HealthChangeReagentsJsonGenerator.PublishJson(file);
                 file.Flush();
-                // Corvax-Wiki-End
+                // Wiki-End
                 IoCManager.Resolve<IBaseServer>().Shutdown("Data generation done");
             }
             else

Content.Server/GuideGenerator/ChemistryJsonGenerator.cs

@@ -38,7 +38,7 @@ public static void PublishJson(StreamWriter file)
         var serializeOptions = new JsonSerializerOptions
         {
             WriteIndented = true,
-            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, // Corvax-Wiki
+            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, // Wiki
             Converters =
             {
                 new UniversalJsonConverter<ReagentEffect>(),

Content.Server/GuideGenerator/ReactionJsonGenerator.cs

@@ -19,14 +19,14 @@ public static void PublishJson(StreamWriter file)
                 .Select(x => new ReactionEntry(x))
                 .ToDictionary(x => x.Id, x => x);
 
-        // Corvax-Wiki-Start
+        // Wiki-Start
         if (reactions is not null) AddMixingCategories(reactions, prototype);
-        // Corvax-Wiki-End
+        // Wiki-End
 
         var serializeOptions = new JsonSerializerOptions
         {
             WriteIndented = true,
-            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, // Corvax-Wiki
+            NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals, // Wiki
             Converters =
             {
                 new UniversalJsonConverter<ReagentEffect>(),

Content.Server/GuideGenerator/ReagentEntry.cs

@@ -1,8 +1,9 @@
 using System.Linq;
 using System.Text.Json.Serialization;
+using Content.Server._Sunrise.GuideGenerator;
 using Content.Shared.Chemistry.Reaction;
 using Content.Shared.Chemistry.Reagent;
-using Content.Server.Corvax.GuideGenerator;
+using ReagentEffectsEntry = Content.Server._Sunrise.GuideGenerator.ReagentEffectsEntry;
 
 namespace Content.Server.GuideGenerator;
 
@@ -27,33 +28,33 @@ public sealed class ReagentEntry
     public string SubstanceColor { get; }
 
     [JsonPropertyName("textColor")]
-    public string TextColor { get; } // Corvax-Wiki
+    public string TextColor { get; } // Wiki
 
     [JsonPropertyName("recipes")]
     public List<string> Recipes { get; } = new();
 
     [JsonPropertyName("metabolisms")]
-    public Dictionary<string, Corvax.GuideGenerator.ReagentEffectsEntry>? Metabolisms { get; } // Corvax-Wiki
+    public Dictionary<string, ReagentEffectsEntry>? Metabolisms { get; } // Wiki
 
     public ReagentEntry(ReagentPrototype proto)
     {
         Id = proto.ID;
-        Name = TextTools.TextTools.CapitalizeString(proto.LocalizedName); // Corvax-Wiki
+        Name = TextTools.TextTools.CapitalizeString(proto.LocalizedName); // Wiki
         Group = proto.Group;
         Description = proto.LocalizedDescription;
         PhysicalDescription = proto.LocalizedPhysicalDescription;
         SubstanceColor = proto.SubstanceColor.ToHex();
 
-        // Corvax-Wiki-Start
+        // Wiki-Start
         var r = proto.SubstanceColor.R;
         var g = proto.SubstanceColor.G;
         var b = proto.SubstanceColor.B;
         TextColor = (0.2126f * r + 0.7152f * g + 0.0722f * b > 0.5
             ? Color.Black
             : Color.White).ToHex();
 
-        Metabolisms = proto.Metabolisms?.ToDictionary(x => x.Key.Id, x => new Corvax.GuideGenerator.ReagentEffectsEntry(x.Value));
-        // Corvax-Wiki-End
+        Metabolisms = proto.Metabolisms?.ToDictionary(x => x.Key.Id, x => new ReagentEffectsEntry(x.Value));
+        // Wiki-End
     }
 }
 
@@ -71,7 +72,7 @@ public sealed class ReactionEntry
     [JsonPropertyName("products")]
     public Dictionary<string, float> Products { get; }
 
-    // Corvax-Wiki-Start
+    // Wiki-Start
     [JsonPropertyName("mixingCategories")]
     public List<MixingCategoryEntry> MixingCategories { get; } = new();
 
@@ -88,13 +89,13 @@ public sealed class ReactionEntry
     public List<ReagentEffectEntry> ExportEffects { get; } = new();
 
     [JsonIgnore]
-    // Corvax-Wiki-End
+    // Wiki-End
     public List<ReagentEffect> Effects { get; }
 
     public ReactionEntry(ReactionPrototype proto)
     {
         Id = proto.ID;
-        Name = TextTools.TextTools.CapitalizeString(proto.Name); // Corvax-Wiki
+        Name = TextTools.TextTools.CapitalizeString(proto.Name); // Wiki
         Reactants =
             proto.Reactants
                 .Select(x => KeyValuePair.Create(x.Key, new ReactantEntry(x.Value.Amount.Float(), x.Value.Catalyst)))
@@ -105,12 +106,12 @@ public ReactionEntry(ReactionPrototype proto)
                 .ToDictionary(x => x.Key, x => x.Value);
         Effects = proto.Effects;
 
-        // Corvax-Wiki-Start    
+        // Wiki-Start
         ExportEffects = proto.Effects.Select(x => new ReagentEffectEntry(x)).ToList();
         MinTemp = proto.MinimumTemperature;
         MaxTemp = proto.MaximumTemperature;
         HasMax = !float.IsPositiveInfinity(MaxTemp);
-        // Corvax-Wiki-End
+        // Wiki-End
     }
 }
 

Content.Server/GuideGenerator/UniversalJsonConverter.cs

@@ -76,7 +76,7 @@ public override void Write(Utf8JsonWriter writer, T obj, JsonSerializerOptions o
                 // If GetIndexParameters().Length is not 0 then it means that property is indexed
                 // And since we cannot get its values without passing index (which type can LITERALLY BE ANYTHING) then let's just skip it
                 // Yeah, i know that this will lead to a potential data loss, but what i can do about it?
-                if (prop.GetIndexParameters().Length != 0) continue; // Corvax-Wiki
+                if (prop.GetIndexParameters().Length != 0) continue; // Wiki
 
                 // If the property has a [JsonPropertyName] attribute, get the property name. Otherwise, use the property name.
                 JsonPropertyNameAttribute? attr = (JsonPropertyNameAttribute?) Attribute.GetCustomAttribute(prop, typeof(JsonPropertyNameAttribute), true);

Content.Server/_Sunrise/GuideGenerator/EntityEntry.cs

@@ -17,7 +17,7 @@ public sealed class EntityEntry
     public EntityEntry(EntityPrototype proto)
     {
         Id = proto.ID;
-        Name = TextTools.TextTools.CapitalizeString(proto.Name); // Corvax-Wiki
+        Name = TextTools.TextTools.CapitalizeString(proto.Name); // Wiki
         Description = proto.Description;
     }
 }

Content.Server/_Sunrise/GuideGenerator/GrindRecipeEntry.cs

@@ -53,7 +53,7 @@ public GrindRecipeEntry(EntityPrototype proto)
         // B) Have "SolutionContainerManager" component on it.
         // C) Have "GrindableSolution" declared in "SolutionContainerManager" component.
         // D) Have solution with name declared in "SolutionContainerManager.GrindableSolution" inside its "SolutionContainerManager" component.
-        // F) Have "Food" in its name (see Content.Server/Corvax/GuideGenerator/MealsRecipesJsonGenerator.cs)
+        // F) Have "Food" in its name (see Content.Server/_Sunrise/GuideGenerator/MealsRecipesJsonGenerator.cs)
         if (proto.Components.TryGetComponent("Extractable", out var extractableComp) && proto.Components.TryGetComponent("SolutionContainerManager", out var solutionCompRaw))
         {
             var extractable = (ExtractableComponent) extractableComp;

Content.Server/_Sunrise/GuideGenerator/HealthChangeReagentsJsonGenerator.cs

@@ -1,12 +1,11 @@
-using Content.Server.Chemistry.ReagentEffects;
-using Content.Shared.Chemistry.Reagent;
-using Robust.Shared.Prototypes;
 using System.IO;
 using System.Linq;
 using System.Text.Json;
-using static Content.Server.GuideGenerator.ChemistryJsonGenerator;
+using Content.Server.Chemistry.ReagentEffects;
+using Content.Shared.Chemistry.Reagent;
+using Robust.Shared.Prototypes;
 
-namespace Content.Server.Corvax.GuideGenerator;
+namespace Content.Server._Sunrise.GuideGenerator;
 public sealed class HealthChangeReagentsJsonGenerator
 {
     public static void PublishJson(StreamWriter file)

Content.Server/_Sunrise/GuideGenerator/MixingCategoryEntry.cs

@@ -1,7 +1,7 @@
-using Content.Shared.Chemistry.Reaction;
 using System.Text.Json.Serialization;
+using Content.Shared.Chemistry.Reaction;
 
-namespace Content.Server.Corvax.GuideGenerator;
+namespace Content.Server._Sunrise.GuideGenerator;
 
 public sealed class MixingCategoryEntry
 {

Content.Server/_Sunrise/GuideGenerator/ReactionJsonGenerator.cs

@@ -1,4 +1,4 @@
-using Content.Server.Corvax.GuideGenerator;
+using Content.Server.GuideGenerator;
 using Content.Shared.Chemistry.Reaction;
 using Robust.Shared.Prototypes;
 

Content.Server/_Sunrise/GuideGenerator/ReagentEffectEntry.cs

@@ -1,8 +1,8 @@
+using System.Text.Json.Serialization;
 using Content.Shared.Chemistry.Reagent;
 using Robust.Shared.Prototypes;
-using System.Text.Json.Serialization;
 
-namespace Content.Server.Corvax.GuideGenerator;
+namespace Content.Server._Sunrise.GuideGenerator;
 public sealed class ReagentEffectEntry
 {
     [JsonPropertyName("id")]

Content.Server/_Sunrise/GuideGenerator/ReagentEffectsEntry.cs

@@ -1,8 +1,8 @@
-using Content.Shared.FixedPoint;
 using System.Linq;
 using System.Text.Json.Serialization;
+using Content.Shared.FixedPoint;
 
-namespace Content.Server.Corvax.GuideGenerator;
+namespace Content.Server._Sunrise.GuideGenerator;
 public sealed class ReagentEffectsEntry
 {
     [JsonPropertyName("rate")]

Content.Server/_Sunrise/StationGoal/StationGoalCommand.cs

@@ -1,6 +1,5 @@
 using System.Linq;
 using Content.Server.Administration;
-using Content.Server.Corvax.StationGoal;
 using Content.Shared.Administration;
 using Robust.Shared.Console;
 using Robust.Shared.Prototypes;

Content.Server/_Sunrise/StationGoal/StationGoalPaperSystem.cs

@@ -1,5 +1,4 @@
 using System.Linq;
-using Content.Server.Corvax.StationGoal;
 using Content.Server.Paper;
 using Content.Shared.Fax.Components;
 using Content.Shared.GameTicking;

Content.Shared/Preferences/Loadouts/RoleLoadout.cs

@@ -54,7 +54,7 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
     {
         var groupRemove = new ValueList<string>();
         var protoManager = collection.Resolve<IPrototypeManager>();
-        var netManager = collection.Resolve<INetManager>(); // Corvax-Loadouts
+        var netManager = collection.Resolve<INetManager>();
 
         if (!protoManager.TryIndex(Role, out var roleProto))
         {
@@ -74,7 +74,6 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
                 continue;
             }
 
-            // Corvax-Loadouts-Start
             var groupProtoLoadouts = groupProto.Loadouts;
             if (collection.TryResolveType<ISharedLoadoutsManager>(out var loadoutsManager) && group.Id == "Inventory")
             {
@@ -90,7 +89,6 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
 
                 groupProtoLoadouts = prototypes.Select(id => (ProtoId<LoadoutPrototype>)id).ToList();
             }
-            // Corvax-Loadouts-End
 
             var loadouts = groupLoadouts[..Math.Min(groupLoadouts.Count, groupProto.MaxLimit)];
 
@@ -113,13 +111,11 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
                     continue;
                 }
 
-                // Corvax-Loadouts-Start: Validate if loadout exist in group. It's can't be f real
                 if (!groupProtoLoadouts.Contains(loadout.Prototype))
                 {
                     loadouts.RemoveAt(i);
                     continue;
                 }
-                // Corvax-Loadouts-End
 
                 // Validate the loadout can be applied (e.g. points).
                 if (!IsValid(profile, session, loadout.Prototype, collection, out _))
@@ -136,9 +132,9 @@ public void EnsureValid(HumanoidCharacterProfile profile, ICommonSession session
             // If you put invalid ones first but that's your fault for not using sensible defaults
             if (loadouts.Count < groupProto.MinLimit)
             {
-                for (var i = 0; i < Math.Min(groupProto.MinLimit, groupProtoLoadouts.Count); i++) // Corvax-Loadout: Use groupProtoLoadouts instead of groupProto.Loadouts
+                for (var i = 0; i < Math.Min(groupProto.MinLimit, groupProtoLoadouts.Count); i++)
                 {
-                    if (!protoManager.TryIndex(groupProtoLoadouts[i], out var loadoutProto)) // Corvax-Loadout
+                    if (!protoManager.TryIndex(groupProtoLoadouts[i], out var loadoutProto))
                         continue;
 
                     var defaultLoadout = new Loadout()