Revert "namespaces changes for everythin"

This reverts commit 221ee3e.

Content.Client/_CorvaxNext/Body/BodySystem.cs

@@ -1,13 +1,12 @@
-using Content.Shared.Body.Systems;
+using Content.Shared.Body.Systems;
 using Content.Shared.Body.Part;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Robust.Client.GameObjects;
 using Robust.Shared.Utility;
 using Content.Shared.Body.Components;
-using Content.Shared._CorvaxNext.Surgery.Body.Part;
 
-namespace Content.Client._CorvaxNext.Body.Systems;
+namespace Content.Client.Body.Systems;
 
 public sealed class BodySystem : SharedBodySystem
 {

Content.Server/Body/Systems/BodySystem.cs

@@ -15,7 +15,6 @@
 using Robust.Shared.Audio;
 using Robust.Shared.Timing;
 using System.Numerics;
-using Content.Shared._CorvaxNext.Surgery.Body.Part;
 
 namespace Content.Server.Body.Systems;
 

Content.Server/_CorvaxNext/Surgery/SurgerySystem.cs

@@ -6,6 +6,8 @@
 using Content.Server.Popups;
 using Content.Shared.Damage;
 using Content.Shared.Interaction;
+using Content.Shared.Medical.Surgery.Conditions;
+using Content.Shared.Medical.Surgery.Effects.Step;
 using Content.Shared.Eye.Blinding.Components;
 using Content.Shared.Eye.Blinding.Systems;
 using Content.Shared.Prototypes;
@@ -17,9 +19,8 @@
 using Content.Shared._CorvaxNext.Surgery;
 using Content.Shared._CorvaxNext.Surgery.Effects.Step;
 using Content.Shared._CorvaxNext.Surgery.Tools;
-using Content.Shared._CorvaxNext.Surgery.Conditions;
-using Content.Shared._CorvaxNext.Surgery.Effects.Step;
 using Content.Shared.Bed.Sleep;
+using Content.Shared.Medical.Surgery;
 
 namespace Content.Server._CorvaxNext.Surgery;
 

Content.Shared/Body/Systems/SharedBodySystem.Body.cs

@@ -1,7 +1,6 @@
 using System.Linq;
 using System.Numerics;
 using Content.Shared._CorvaxNext.Targeting;
-using Content.Shared._CorvaxNext.Surgery.Body.Part;
 using Content.Shared.Body.Components;
 using Content.Shared.Body.Organ;
 using Content.Shared.Body.Part;

Content.Shared/Body/Systems/SharedBodySystem.Parts.cs

@@ -10,8 +10,6 @@
 using Content.Shared.Movement.Components;
 using Content.Shared.Random;
 using Content.Shared._CorvaxNext.Targeting;
-using Content.Shared._CorvaxNext.Surgery.Body.Part;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
 using Robust.Shared.Containers;
 using Robust.Shared.Utility;
 using System.Diagnostics.CodeAnalysis;

Content.Shared/_CorvaxNext/Surgery/Body/Events/AmputateAttemptEvent.cs → Content.Shared/_CorvaxNext/Surgery/Body/AmputateAttemptEvent.cs

@@ -1,4 +1,4 @@
-namespace Content.Shared._CorvaxNext.Surgery.Body.Events;
+namespace Content.Shared.Body.Events;
 
 /// <summary>
 /// Raised on an entity when attempting to remove a body part.

Content.Shared/_CorvaxNext/Surgery/Body/BodyPartAppearanceComponent.cs

@@ -4,7 +4,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Body.Part;
+namespace Content.Shared.Body.Part;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)]
 public sealed partial class BodyPartAppearanceComponent : Component

Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.PartAppearance.cs

@@ -1,17 +1,13 @@
 using System.Diagnostics;
 using System.Linq;
-using Content.Shared._CorvaxNext.Surgery.Body.Part;
 using Content.Shared.Body.Components;
-using Content.Shared.Body.Systems;
 using Content.Shared.Body.Part;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Humanoid.Prototypes;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Utility;
-using Robust.Shared.GameObjects;
 
-// You can't have different namespaces when using partial keyword and instantiating
 namespace Content.Shared.Body.Systems;
 
 public partial class SharedBodySystem

Content.Shared/_CorvaxNext/Surgery/Body/SharedBodySystem.Targeting.cs

@@ -19,7 +19,6 @@
 using Content.Shared.Damage.Prototypes;
 using Content.Shared.FixedPoint;
 
-// You can't have different namespaces when using partial keyword and instantiating
 // ReSharper disable once CheckNamespace
 namespace Content.Shared.Body.Systems;
 

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryCloseIncisionConditionComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryCloseIncisionConditionComponent : Component;
+public sealed partial class SurgeryCloseIncisionConditionComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryLarvaConditionComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryLarvaConditionComponent : Component;
+public sealed partial class SurgeryLarvaConditionComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryMarkingConditionComponent.cs

@@ -3,7 +3,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryMarkingConditionComponent : Component

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOperatingTableConditionComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryOperatingTableConditionComponent : Component;
+public sealed partial class SurgeryOperatingTableConditionComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryOrganConditionComponent.cs

@@ -2,7 +2,7 @@
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryOrganConditionComponent : Component
@@ -15,4 +15,4 @@ public sealed partial class SurgeryOrganConditionComponent : Component
 
     [DataField]
     public bool Reattaching;
-}
+}

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartConditionComponent.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Body.Part;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryPartConditionComponent : Component
@@ -14,4 +14,4 @@ public sealed partial class SurgeryPartConditionComponent : Component
 
     [DataField]
     public bool Inverse;
-}
+}

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartPresentCondition.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryPartPresentConditionComponent : Component;
+public sealed partial class SurgeryPartPresentConditionComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryPartRemovedConditionComponent.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Body.Part;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryPartRemovedConditionComponent : Component

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryValidEvent.cs

@@ -1,9 +1,9 @@
 using Content.Shared.Body.Part;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 /// <summary>
 ///     Raised on the entity that is receiving surgery.
 /// </summary>
 [ByRefEvent]
-public record struct SurgeryValidEvent(EntityUid Body, EntityUid Part, bool Cancelled = false, BodyPartType PartType = default, BodyPartSymmetry? Symmetry = default);
+public record struct SurgeryValidEvent(EntityUid Body, EntityUid Part, bool Cancelled = false, BodyPartType PartType = default, BodyPartSymmetry? Symmetry = default);

Content.Shared/_CorvaxNext/Surgery/Conditions/SurgeryWoundedConditionComponent.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Body.Part;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Conditions;
+namespace Content.Shared.Medical.Surgery.Conditions;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryWoundedConditionComponent : Component;
+public sealed partial class SurgeryWoundedConditionComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryCompletedEvent.cs

@@ -1,7 +1,7 @@
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Complete;
+namespace Content.Shared.Medical.Surgery.Effects.Complete;
 
 /// <summary>
 ///     Raised on the entity that received the surgery.
 /// </summary>
 [ByRefEvent]
-public record struct SurgeryCompletedEvent;
+public record struct SurgeryCompletedEvent;

Content.Shared/_CorvaxNext/Surgery/Effects/Complete/SurgeryRemoveLarvaComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Complete;
+namespace Content.Shared.Medical.Surgery.Effects.Complete;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryRemoveLarvaComponent : Component;
+public sealed partial class SurgeryRemoveLarvaComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Effects/Step/SurgerySpecialDamageChangeEffectComponent.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Damage;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
-namespace Content.Shared._CorvaxNext.Surgery.Effects.Step;
+namespace Content.Shared.Medical.Surgery.Effects.Step;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgerySpecialDamageChangeEffectComponent : Component
@@ -11,4 +11,4 @@ public sealed partial class SurgerySpecialDamageChangeEffectComponent : Componen
 
     [DataField]
     public bool IsConsumable;
-}
+}

Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.Steps.cs

@@ -1,3 +1,5 @@
+using Content.Shared.Medical.Surgery.Conditions;
+using Content.Shared.Medical.Surgery.Steps;
 using Content.Shared.Humanoid;
 using Content.Shared.Humanoid.Markings;
 using Content.Shared.Bed.Sleep;
@@ -14,15 +16,13 @@
 using Content.Shared.Popups;
 using Robust.Shared.Prototypes;
 using System.Linq;
-using Content.Shared._CorvaxNext.Surgery.Body.Part;
 using Content.Shared._CorvaxNext.Surgery.Body.Organs;
-using Content.Shared._CorvaxNext.Surgery.Body.Events;
 using Content.Shared._CorvaxNext.Surgery.Effects.Step;
 using Content.Shared._CorvaxNext.Surgery.Steps;
 using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-using Content.Shared._CorvaxNext.Surgery.Conditions;
 using Content.Shared._CorvaxNext.Surgery.Tools;
 using Content.Shared.Containers.ItemSlots;
+using Content.Shared.Medical.Surgery;
 
 namespace Content.Shared._CorvaxNext.Surgery;
 

Content.Shared/_CorvaxNext/Surgery/SharedSurgerySystem.cs

@@ -1,8 +1,8 @@
 using System.Linq;
 using Content.Shared._CorvaxNext.Surgery.Steps.Parts;
-using Content.Shared._CorvaxNext.Surgery.Conditions;
-using Content.Shared._CorvaxNext.Surgery.Steps;
+using Content.Shared.Medical.Surgery.Conditions;
 using Content.Shared.Body.Systems;
+using Content.Shared.Medical.Surgery.Steps;
 using Content.Shared.Body.Part;
 using Content.Shared.Damage;
 using Content.Shared.Containers.ItemSlots;

Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAddPartStepComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
+namespace Content.Shared.Medical.Surgery.Steps;
 
 [RegisterComponent, NetworkedComponent]
-public sealed partial class SurgeryAddPartStepComponent : Component;
+public sealed partial class SurgeryAddPartStepComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixOrganStepComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
+namespace Content.Shared.Medical.Surgery.Steps;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryAffixOrganStepComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryAffixPartStepComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
+namespace Content.Shared.Medical.Surgery.Steps;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryAffixPartStepComponent : Component;

Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRemoveMarkingStepComponent.cs

@@ -2,7 +2,7 @@
 using Content.Shared.Humanoid;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
+namespace Content.Shared.Medical.Surgery.Steps;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryRemoveMarkingStepComponent : Component

Content.Shared/_CorvaxNext/Surgery/Steps/SurgeryRepeatableStepComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.GameStates;
 
-namespace Content.Shared._CorvaxNext.Surgery.Steps;
+namespace Content.Shared.Medical.Surgery.Steps;
 
 [RegisterComponent, NetworkedComponent]
 public sealed partial class SurgeryRepeatableStepComponent : Component;

Content.Shared/_CorvaxNext/Surgery/SurgeryStepDamageChangeEvent.cs

@@ -1,6 +1,6 @@
 using Content.Shared.Damage;
 
-namespace Content.Shared._CorvaxNext.Surgery;
+namespace Content.Shared.Medical.Surgery;
 
 /// <summary>
 ///     Raised on the target entity.