first commit

Content.Client/HealthAnalyzer/UI/HealthAnalyzerBoundUserInterface.cs

@@ -1,5 +1,5 @@
 using Content.Shared.MedicalScanner;
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using JetBrains.Annotations;
 using Robust.Client.GameObjects;
 

Content.Client/HealthAnalyzer/UI/HealthAnalyzerWindow.xaml.cs

@@ -4,7 +4,7 @@
 using Content.Shared.Atmos;
 using Content.Client.UserInterface.Controls;
 using Content.Shared.Alert;
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Damage;
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
@@ -37,7 +37,7 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow
         private readonly IPrototypeManager _prototypes;
         private readonly IResourceCache _cache;
 
-        // Start-backmen: surgery
+        // Start-_CorvaxNext: surgery
         public event Action<TargetBodyPart?, EntityUid>? OnBodyPartSelected;
         private EntityUid _spriteViewEntity;
 
@@ -47,7 +47,7 @@ public sealed partial class HealthAnalyzerWindow : FancyWindow
         private readonly Dictionary<TargetBodyPart, TextureButton> _bodyPartControls;
         private EntityUid? _target;
 
-        // End-backmen: surgery
+        // End-_CorvaxNext: surgery
 
         public HealthAnalyzerWindow()
         {
@@ -58,7 +58,7 @@ public HealthAnalyzerWindow()
             _spriteSystem = _entityManager.System<SpriteSystem>();
             _prototypes = dependencies.Resolve<IPrototypeManager>();
             _cache = dependencies.Resolve<IResourceCache>();
-            // Start-backmen: surgery
+            // Start-_CorvaxNext: surgery
             _bodyPartControls = new Dictionary<TargetBodyPart, TextureButton>
             {
                 { TargetBodyPart.Head, HeadButton },
@@ -80,7 +80,7 @@ public HealthAnalyzerWindow()
                 bodyPartButton.Value.OnPressed += _ => SetActiveBodyPart(bodyPartButton.Key, bodyPartButton.Value);
             }
             ReturnButton.OnPressed += _ => ResetBodyPart();
-            // End-backmen: surgery
+            // End-_CorvaxNext: surgery
         }
 
         public void SetActiveBodyPart(TargetBodyPart part, TextureButton button)
@@ -108,7 +108,7 @@ public void SetActiveButtons(bool isHumanoid)
 
         public void Populate(HealthAnalyzerScannedUserMessage msg)
         {
-            // Start-backmen: surgery
+            // Start-_CorvaxNext: surgery
             _target = _entityManager.GetEntity(msg.TargetEntity);
             EntityUid? part = msg.Part != null ? _entityManager.GetEntity(msg.Part.Value) : null;
             var isPart = part != null;
@@ -222,7 +222,7 @@ public void Populate(HealthAnalyzerScannedUserMessage msg)
             IReadOnlyDictionary<string, FixedPoint2> damagePerType = damageable.Damage.DamageDict;
 
             DrawDiagnosticGroups(damageSortedGroups, damagePerType);
-            // End-backmen: surgery
+            // End-_CorvaxNext: surgery
         }
 
         private static string GetStatus(MobState mobState)
@@ -324,7 +324,7 @@ private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
             return rootContainer;
         }
 
-        // Start-backmen: surgery
+        // Start-_CorvaxNext: surgery
         /// <summary>
         /// Sets up the Body Doll using Alert Entity to use in Health Analyzer.
         /// </summary>
@@ -358,6 +358,6 @@ private BoxContainer CreateDiagnosticGroupTitle(string text, string id)
             }
             return _spriteViewEntity;
         }
-        // End-backmen: surgery
+        // End-_CorvaxNext: surgery
     }
 }

Content.Client/Inventory/ClientInventorySystem.cs

@@ -5,7 +5,7 @@
 using Content.Shared.Inventory;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Storage;
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using JetBrains.Annotations;
 using Robust.Client.Player;
 using Robust.Client.UserInterface;

Content.Client/UserInterface/Screens/DefaultGameScreen.xaml

@@ -9,7 +9,7 @@
     xmlns:hotbar="clr-namespace:Content.Client.UserInterface.Systems.Hotbar.Widgets"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
-    xmlns:targeting="clr-namespace:Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets"
+    xmlns:targeting="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="DefaultHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"

Content.Client/UserInterface/Screens/SeparatedChatGameScreen.xaml

@@ -10,7 +10,7 @@
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:inventory="clr-namespace:Content.Client.UserInterface.Systems.Inventory.Widgets"
-    xmlns:targeting="clr-namespace:Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets"
+    xmlns:targeting="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="SeparatedChatHud"
     VerticalExpand="False"
     VerticalAlignment="Bottom"

Content.Client/UserInterface/Systems/Alerts/Widgets/AlertsUI.xaml

@@ -1,6 +1,6 @@
 <widgets:AlertsUI xmlns="https://spacestation14.io"
                   xmlns:widgets="clr-namespace:Content.Client.UserInterface.Systems.Alerts.Widgets"
-                  xmlns:partStatus="clr-namespace:Content.Client.Backmen.UserInterface.Systems.PartStatus.Widgets"
+                  xmlns:partStatus="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
                   MinSize="64 64">
     <GridContainer Columns="1" HorizontalAlignment="Right" VerticalAlignment="Top">
         <PanelContainer >

Content.Client/Backmen/Body/Components/BrainComponent.cs → Content.Client/_CorvaxNext/Body/Components/BrainComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.Backmen.Body.Components;
+namespace Content.Client._CorvaxNext.Body.Components;
 
 [RegisterComponent]
 public sealed partial class BrainComponent : Component;

Content.Client/Backmen/Body/Components/LungComponent.cs → Content.Client/_CorvaxNext/Body/Components/LungComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.Backmen.Body.Components;
+namespace Content.Client._CorvaxNext.Body.Components;
 
 [RegisterComponent]
 public sealed partial class LungComponent : Component;

Content.Client/Backmen/Body/Components/StomachComponent.cs → Content.Client/_CorvaxNext/Body/Components/StomachComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.Backmen.Body.Components;
+namespace Content.Client._CorvaxNext.Body.Components;
 
 [RegisterComponent]
 public sealed partial class StomachComponent : Component;

Content.Client/Backmen/Surgery/SurgeryBui.cs → Content.Client/_CorvaxNext/Surgery/SurgeryBui.cs

@@ -1,6 +1,6 @@
 using Content.Client.Xenonids.UI;
 using Content.Client.Administration.UI.CustomControls;
-using Content.Shared.Backmen.Surgery;
+using Content.Shared._CorvaxNext.Surgery;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Part;
 using JetBrains.Annotations;
@@ -9,7 +9,7 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Backmen.Surgery;
+namespace Content.Client._CorvaxNext.Surgery;
 
 [UsedImplicitly]
 public sealed class SurgeryBui : BoundUserInterface

Content.Client/Backmen/Surgery/SurgeryStepButton.xaml → Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml

@@ -1,4 +1,4 @@
 <surgery:SurgeryStepButton
     xmlns="https://spacestation14.io"
-    xmlns:surgery="clr-namespace:Content.Client.Backmen.Surgery">
+    xmlns:surgery="clr-namespace:Content.Client._CorvaxNext.Surgery">
 </surgery:SurgeryStepButton>

Content.Client/Backmen/Surgery/SurgeryStepButton.xaml.cs → Content.Client/_CorvaxNext/Surgery/SurgeryStepButton.xaml.cs

@@ -2,7 +2,7 @@
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Backmen.Surgery;
+namespace Content.Client._CorvaxNext.Surgery;
 
 [GenerateTypedNameReferences]
 public sealed partial class SurgeryStepButton : XenoChoiceControl

Content.Client/Backmen/Surgery/SurgerySystem.cs → Content.Client/_CorvaxNext/Surgery/SurgerySystem.cs

@@ -1,6 +1,6 @@
-using Content.Shared.Backmen.Surgery;
+using Content.Shared._CorvaxNext.Surgery;
 
-namespace Content.Client.Backmen.Surgery;
+namespace Content.Client._CorvaxNext.Surgery;
 
 public sealed class SurgerySystem : SharedSurgerySystem
 {

Content.Client/Backmen/Surgery/SurgeryWindow.xaml → Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml

@@ -1,6 +1,6 @@
 <controls:SurgeryWindow
     xmlns="https://spacestation14.io"
-    xmlns:controls="clr-namespace:Content.Client.Backmen.Surgery"
+    xmlns:controls="clr-namespace:Content.Client._CorvaxNext.Surgery"
     xmlns:cc="clr-namespace:Content.Client.Administration.UI.CustomControls"
     xmlns:graphics="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     MinSize="400 400">

Content.Client/Backmen/Surgery/SurgeryWindow.xaml.cs → Content.Client/_CorvaxNext/Surgery/SurgeryWindow.xaml.cs

@@ -2,7 +2,7 @@
 using Robust.Client.UserInterface.CustomControls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Backmen.Surgery;
+namespace Content.Client._CorvaxNext.Surgery;
 
 [GenerateTypedNameReferences]
 public sealed partial class SurgeryWindow : DefaultWindow

Content.Client/Backmen/Targeting/TargetingSystem.cs → Content.Client/_CorvaxNext/Targeting/TargetingSystem.cs

@@ -1,10 +1,10 @@
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using Content.Shared.Input;
 using Robust.Client.Player;
 using Robust.Shared.Input.Binding;
 using Robust.Shared.Player;
 
-namespace Content.Client.Backmen.Targeting;
+namespace Content.Client._CorvaxNext.Targeting;
 public sealed class TargetingSystem : SharedTargetingSystem
 {
     [Dependency] private readonly IPlayerManager _playerManager = default!;

Content.Client/Backmen/UserInterface/Systems/PartStatus/PartStatusUIController.cs → Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/PartStatusUIController.cs

@@ -1,13 +1,13 @@
-using Content.Client.Backmen.UserInterface.Systems.PartStatus.Widgets;
+using Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets;
 using Content.Client.Gameplay;
-using Content.Shared.Backmen.Targeting;
-using Content.Client.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
+using Content.Client._CorvaxNext.Targeting;
 using Robust.Client.GameObjects;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Shared.Utility;
 using Robust.Client.Graphics;
 
-namespace Content.Client.Backmen.UserInterface.Systems.PartStatus;
+namespace Content.Client._CorvaxNext.UserInterface.Systems.PartStatus;
 
 public sealed class PartStatusUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
 {

Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml → Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml

@@ -2,7 +2,7 @@
     xmlns="https://spacestation14.io"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:widgets="clr-namespace:Content.Client.Backmen.UserInterface.Systems.PartStatus.Widgets"
+    xmlns:widgets="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets"
     Name="PartStatusIndicator"
     VerticalAlignment="Center"
     HorizontalAlignment="Center">

Content.Client/Backmen/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs → Content.Client/_CorvaxNext/UserInterface/Systems/PartStatus/Widgets/PartStatusControl.xaml.cs

@@ -1,10 +1,10 @@
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using Robust.Client.AutoGenerated;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 using Robust.Shared.Utility;
 
-namespace Content.Client.Backmen.UserInterface.Systems.PartStatus.Widgets;
+namespace Content.Client._CorvaxNext.UserInterface.Systems.PartStatus.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class PartStatusControl : UIWidget

Content.Client/Backmen/UserInterface/Systems/Targeting/TargetingUIController.cs → Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/TargetingUIController.cs

@@ -1,11 +1,11 @@
-using Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets;
+using Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets;
 using Content.Client.Gameplay;
-using Content.Client.Backmen.Targeting;
-using Content.Shared.Backmen.Targeting;
+using Content.Client._CorvaxNext.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using Robust.Client.UserInterface.Controllers;
 using Robust.Client.Player;
 
-namespace Content.Client.Backmen.UserInterface.Systems.Targeting;
+namespace Content.Client._CorvaxNext.UserInterface.Systems.Targeting;
 
 public sealed class TargetingUIController : UIController, IOnStateEntered<GameplayState>, IOnSystemChanged<TargetingSystem>
 {

Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml → Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml

@@ -2,7 +2,7 @@
     xmlns="https://spacestation14.io"
     xmlns:gfx="clr-namespace:Robust.Client.Graphics;assembly=Robust.Client"
     xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
-    xmlns:widgets="clr-namespace:Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets"
+    xmlns:widgets="clr-namespace:Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets"
     Name="TargetingButton"
     VerticalExpand="True"
     VerticalAlignment="Bottom"

Content.Client/Backmen/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs → Content.Client/_CorvaxNext/UserInterface/Systems/Targeting/Widgets/TargetingControl.xaml.cs

@@ -1,11 +1,11 @@
 using System.Linq;
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 using Robust.Client.AutoGenerated;
 using Robust.Client.Graphics;
 using Robust.Client.UserInterface.Controls;
 using Robust.Client.UserInterface.XAML;
 
-namespace Content.Client.Backmen.UserInterface.Systems.Targeting.Widgets;
+namespace Content.Client._CorvaxNext.UserInterface.Systems.Targeting.Widgets;
 
 [GenerateTypedNameReferences]
 public sealed partial class TargetingControl : UIWidget

Content.Server/Atmos/EntitySystems/BarotraumaSystem.cs

@@ -237,7 +237,7 @@ public override void Update(float frameTime)
                 if (pressure <= Atmospherics.HazardLowPressure)
                 {
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false, canSever: false); // backmen
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * Atmospherics.LowPressureDamage, true, false, canSever: false); // _CorvaxNext
                     if (!barotrauma.TakingDamage)
                     {
                         barotrauma.TakingDamage = true;
@@ -251,7 +251,7 @@ public override void Update(float frameTime)
                     var damageScale = MathF.Min(((pressure / Atmospherics.HazardHighPressure) - 1) * Atmospherics.PressureDamageCoefficient, Atmospherics.MaxHighPressureDamage);
 
                     // Deal damage and ignore resistances. Resistance to pressure damage should be done via pressure protection gear.
-                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false); // backmen
+                    _damageableSystem.TryChangeDamage(uid, barotrauma.Damage * damageScale, true, false, canSever: false); // _CorvaxNext
 
                     if (!barotrauma.TakingDamage)
                     {

Content.Server/Body/Systems/BodySystem.cs

@@ -33,18 +33,18 @@ public override void Initialize()
 
         SubscribeLocalEvent<BodyComponent, MoveInputEvent>(OnRelayMoveInput);
         SubscribeLocalEvent<BodyComponent, ApplyMetabolicMultiplierEvent>(OnApplyMetabolicMultiplier);
-        SubscribeLocalEvent<BodyPartComponent, AttemptEntityGibEvent>(OnGibTorsoAttempt); // backmen: surgery
+        SubscribeLocalEvent<BodyPartComponent, AttemptEntityGibEvent>(OnGibTorsoAttempt); // _CorvaxNext: surgery
     }
 
-    // start-backmen: surgery
+    // start-_CorvaxNext: surgery
     private void OnGibTorsoAttempt(Entity<BodyPartComponent> ent, ref AttemptEntityGibEvent args)
     {
         if (ent.Comp.PartType == BodyPartType.Torso)
         {
             args.GibType = GibType.Skip;
         }
     }
-    // end-backmen: surgery
+    // end-_CorvaxNext: surgery
 
     private void OnRelayMoveInput(Entity<BodyComponent> ent, ref MoveInputEvent args)
     {
@@ -190,5 +190,5 @@ protected override void RemoveBodyMarkings(EntityUid target, BodyPartAppearanceC
 
         Dirty(target, bodyAppearance);
     }
-    // end-backmen: surgery
+    // end-_CorvaxNext: surgery
 }

Content.Server/Body/Systems/BrainSystem.cs

@@ -1,12 +1,12 @@
 using Content.Server.Body.Components;
 using Content.Server.Ghost.Components;
-using Content.Shared.Backmen.Surgery.Body;
+using Content.Shared._CorvaxNext.Surgery.Body;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Systems;
 using Content.Shared.Body.Events;
 using Content.Shared.Body.Organ;
-using Content.Server.Backmen.DelayedDeath;
-using Content.Shared.Backmen.Surgery.Body.Organs;
+using Content.Server._CorvaxNext.DelayedDeath;
+using Content.Shared._CorvaxNext.Surgery.Body.Organs;
 using Content.Shared.Mind;
 using Content.Shared.Mind.Components;
 using Content.Shared.Pointing;

Content.Server/Body/Systems/RespiratorSystem.cs

@@ -16,7 +16,7 @@
 using Content.Shared.Database;
 using Content.Shared.EntityEffects;
 using Content.Shared.Mobs.Systems;
-using Content.Shared.Backmen.Surgery.Body;
+using Content.Shared._CorvaxNext.Surgery.Body;
 using JetBrains.Annotations;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;

Content.Server/EntityEffects/Effects/HealthChange.cs

@@ -7,7 +7,7 @@
 using Robust.Shared.Prototypes;
 using System.Linq;
 using System.Text.Json.Serialization;
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 
 namespace Content.Server.EntityEffects.Effects
 {
@@ -126,11 +126,11 @@ public override void Effect(EntityEffectBaseArgs args)
                 Damage * scale,
                 IgnoreResistances,
                 interruptsDoAfters: false,
-                // start-backmen: surgery
+                // start-_CorvaxNext: surgery
                 targetPart: TargetBodyPart.All,
                 partMultiplier: 0.5f,
                 canSever: false);
-                // end-backmen: surgery
+                // end-_CorvaxNext: surgery
         }
     }
 }

Content.Server/Medical/HealingSystem.cs

@@ -26,7 +26,7 @@
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Random;
 using System.Linq;
-using Content.Shared.Backmen.Targeting;
+using Content.Shared._CorvaxNext.Targeting;
 
 namespace Content.Server.Medical;