Respace Species Code

Content.Client/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs → Content.Client/Species/Felinids/Systems/PseudoItemSystem.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Nyanotrasen.Item.PseudoItem;
+using Content.Shared.Species.Felinids.Systems;
 
 namespace Content.Client.Nyanotrasen.Item.PseudoItem;
 

Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs → Content.Client/Species/Harpy/Components/HarpyVisualsComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Client.DeltaV.Harpy;
+namespace Content.Client.Species.Harpy.Components;
 
 [RegisterComponent]
 public sealed partial class HarpyVisualsComponent : Component

Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs → Content.Client/Species/Harpy/Systems/UltraVisionOverlay.cs

@@ -4,7 +4,7 @@
 using Robust.Shared.Prototypes;
 using Content.Shared.Abilities;
 
-namespace Content.Client.DeltaV.Overlays;
+namespace Content.Client.Species.Harpy.Systems;
 
 public sealed partial class UltraVisionOverlay : Overlay
 {

Content.Client/DeltaV/Overlays/UltraVisionSystem.cs → Content.Client/Species/Harpy/Systems/UltraVisionSystem.cs

@@ -3,7 +3,7 @@
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.DeltaV.Overlays;
+namespace Content.Client.Species.Harpy.Systems;
 
 public sealed partial class UltraVisionSystem : EntitySystem
 {

Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs → Content.Client/Species/Vulpkanin/Systems/DogVisionOverlay.cs

@@ -2,9 +2,9 @@
 using Robust.Client.Player;
 using Robust.Shared.Enums;
 using Robust.Shared.Prototypes;
-using Content.Shared.Abilities;
+using Content.Shared.Species.Vulpkanin.Components;
 
-namespace Content.Client.Nyanotrasen.Overlays;
+namespace Content.Client.Species.Vulpkanin.Systems;
 
 public sealed partial class DogVisionOverlay : Overlay
 {

Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs → Content.Client/Species/Vulpkanin/Systems/DogVisionSystem.cs

@@ -1,9 +1,9 @@
-using Content.Shared.Abilities;
+using Content.Shared.Species.Vulpkanin.Components;
 using Content.Shared.DeltaV.CCVars;
 using Robust.Client.Graphics;
 using Robust.Shared.Configuration;
 
-namespace Content.Client.Nyanotrasen.Overlays;
+namespace Content.Client.Species.Vulpkanin.Systems;
 
 public sealed partial class DogVisionSystem : EntitySystem
 {

Content.Server/Radio/EntitySystems/RadioSystem.cs

@@ -2,6 +2,7 @@
 using Content.Server.Chat.Systems;
 using Content.Server.Power.Components;
 using Content.Server.Radio.Components;
+using Content.Server.Species.Harpy.Components;
 using Content.Server.VoiceMask;
 using Content.Shared.Chat;
 using Content.Shared.Database;

Content.Server/Species/Systems/NymphSystem.cs → Content.Server/Species/Diona/Systems/NymphSystem.cs

@@ -1,12 +1,12 @@
 using Content.Server.Mind;
-using Content.Shared.Species.Components;
+using Content.Shared.Species.Diona.Components;
 using Content.Shared.Body.Events;
 using Content.Shared.Zombies;
 using Content.Server.Zombies;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Timing;
 
-namespace Content.Server.Species.Systems;
+namespace Content.Server.Species.Diona.Systems;
 
 public sealed partial class NymphSystem : EntitySystem
 {

Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs → Content.Server/Species/Felinids/Components/CoughingUpHairballComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Abilities.Felinid;
+namespace Content.Server.Species.Felinids.Components;
 
 [RegisterComponent]
 public sealed partial class CoughingUpHairballComponent : Component

Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs → Content.Server/Species/Felinids/Components/FelinidComponent.cs

@@ -3,7 +3,7 @@
 using Content.Shared.Actions;
 using Robust.Shared.Utility;
 
-namespace Content.Server.Abilities.Felinid;
+namespace Content.Server.Species.Felinids.Components;
 
 [RegisterComponent]
 public sealed partial class FelinidComponent : Component

Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs → Content.Server/Species/Felinids/Components/FelinidFoodComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Abilities.Felinid;
+namespace Content.Server.Species.Felinids.Components;
 
 [RegisterComponent]
 public sealed partial class FelinidFoodComponent : Component

Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs → Content.Server/Species/Felinids/Components/HairballComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Abilities.Felinid;
+namespace Content.Server.Species.Felinids.Components;
 
 [RegisterComponent]
 public sealed partial class HairballComponent : Component

Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs → Content.Server/Species/Felinids/Systems/FelinidSystem.cs

@@ -9,21 +9,23 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Nutrition.Components;
 using Content.Shared.Nutrition.EntitySystems;
+using Content.Shared.Species.Felinids.Systems;
 using Content.Server.Body.Components;
 using Content.Server.Chemistry.Containers.EntitySystems;
 using Content.Server.Medical;
 using Content.Server.Nutrition.EntitySystems;
 using Content.Server.Nutrition.Components;
 using Content.Server.Chemistry.EntitySystems;
 using Content.Server.Popups;
+using Content.Server.Species.Felinids.Components;
 using Content.Shared.Chemistry.EntitySystems;
 using Robust.Shared.Audio;
 using Robust.Shared.Audio.Systems;
 using Robust.Shared.Player;
 using Robust.Shared.Random;
 using Robust.Shared.Prototypes;
 
-namespace Content.Server.Abilities.Felinid;
+namespace Content.Server.Species.Felinids.Systems;
 
 public sealed partial class FelinidSystem : EntitySystem
 {

Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs → Content.Server/Species/Felinids/Systems/PseudoItemSystem.cs

@@ -4,13 +4,13 @@
 using Content.Shared.DoAfter;
 using Content.Shared.IdentityManagement;
 using Content.Shared.Item;
-using Content.Shared.Item.PseudoItem;
-using Content.Shared.Nyanotrasen.Item.PseudoItem;
+using Content.Shared.Species.Felinids.Components;
+using Content.Shared.Species.Felinids.Systems;
 using Content.Shared.Storage;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
 
-namespace Content.Server.Nyanotrasen.Item.PseudoItem;
+namespace Content.Server.Species.Felinids.Systems;
 
 public sealed class PseudoItemSystem : SharedPseudoItemSystem
 {

Content.Server/DeltaV/VoiceMask/SyrinxVoiceMaskComponent.cs → Content.Server/Species/Harpy/Components/SyrinxVoiceMaskComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.VoiceMask;
+namespace Content.Server.Species.Harpy.Components;
 
 [RegisterComponent]
 public sealed partial class SyrinxVoiceMaskComponent : Component

Content.Server/DeltaV/Harpy/HarpySingerSystem.cs → Content.Server/Species/Harpy/Systems/HarpySingerSystem.cs

@@ -19,9 +19,9 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Player;
 using Robust.Shared.Prototypes;
-using Content.Shared.DeltaV.Harpy.Components;
+using Content.Shared.Species.Harpy.Components;
 
-namespace Content.Server.DeltaV.Harpy
+namespace Content.Server.Species.Harpy.Systems
 {
     public sealed class HarpySingerSystem : EntitySystem
     {

Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs → Content.Server/Species/Harpy/Systems/SubdermalBionicSyrinxImplantSystem.cs

@@ -1,7 +1,9 @@
 using Content.Server.Administration.Logs;
 using Content.Server.Chat.Systems;
+using Content.Server.Implants;
 using Content.Server.Popups;
 using Content.Server.VoiceMask;
+using Content.Server.Species.Harpy.Components;
 using Content.Shared.Database;
 using Content.Shared.Implants;
 using Content.Shared.Implants.Components;
@@ -12,7 +14,7 @@
 using Robust.Server.GameObjects;
 using Robust.Shared.Containers;
 
-namespace Content.Server.Implants;
+namespace Content.Server.Species.Harpy.Systems;
 
 public sealed class SubdermalBionicSyrinxImplantSystem : EntitySystem
 {

Content.Server/Nyanotrasen/Abilities/Oni/HeldbyOniComponent.cs → Content.Server/Species/Oni/Components/HeldbyOniComponent.cs

@@ -1,4 +1,4 @@
-namespace Content.Server.Abilities.Oni
+namespace Content.Server.Species.Oni.Components
 {
     [RegisterComponent]
     public sealed partial class HeldByOniComponent : Component

Content.Server/Nyanotrasen/Abilities/Oni/OniComponent.cs → Content.Server/Species/Oni/Components/OniComponent.cs

@@ -1,6 +1,6 @@
 using Content.Shared.Damage;
 
-namespace Content.Server.Abilities.Oni
+namespace Content.Server.Species.Oni.Components
 {
     [RegisterComponent]
     public sealed partial class OniComponent : Component

Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs → Content.Server/Species/Oni/Systems/OniSystem.cs

@@ -1,13 +1,14 @@
+using Content.Server.Species.Oni.Components;
 using Content.Server.Tools;
 using Content.Server.Weapons.Ranged.Systems;
 using Content.Shared.Tools.Components;
 using Content.Shared.Damage.Events;
-using Content.Shared.Nyanotrasen.Abilities.Oni;
+using Content.Shared.Species.Oni.Systems;
 using Content.Shared.Weapons.Melee.Events;
 using Content.Shared.Weapons.Ranged.Components;
 using Robust.Shared.Containers;
 
-namespace Content.Server.Abilities.Oni
+namespace Content.Server.Species.Oni.Systems
 {
     public sealed class OniSystem : SharedOniSystem
     {

Content.Server/Spider/SpiderSystem.cs → Content.Server/Species/Spider/Systems/SpiderSystem.cs

@@ -1,11 +1,12 @@
 using System.Linq;
 using Content.Server.Popups;
-using Content.Shared.Spider;
+using Content.Shared.Species.Spider.Components;
+using Content.Shared.Species.Spider.Systems;
 using Content.Shared.Maps;
 using Robust.Server.GameObjects;
 using Robust.Shared.Map;
 
-namespace Content.Server.Spider;
+namespace Content.Server.Species.Spider.Systems;
 
 public sealed class SpiderSystem : SharedSpiderSystem
 {

Content.Shared/Item/ItemComponent.cs

@@ -1,5 +1,5 @@
 using Content.Shared.Hands.Components;
-using Content.Shared.Nyanotrasen.Item.PseudoItem;
+using Content.Shared.Species.Felinids.Systems;
 using Robust.Shared.GameStates;
 using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization;

Content.Shared/Species/Components/NymphComponent.cs → Content.Shared/Species/Diona/Components/NymphComponent.cs

@@ -1,10 +1,10 @@
 using Robust.Shared.Prototypes;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Species.Components;
+namespace Content.Shared.Species.Diona.Components;
 /// <summary>
 /// This will replace one entity with another entity when it is removed from a body part.
-/// Obviously hyper-specific. If you somehow find another use for this, good on you. 
+/// Obviously hyper-specific. If you somehow find another use for this, good on you.
 /// </summary>
 
 [RegisterComponent, NetworkedComponent]

Content.Shared/Species/Components/ReformComponent.cs → Content.Shared/Species/Diona/Components/ReformComponent.cs

@@ -1,8 +1,8 @@
-    using Robust.Shared.Prototypes;
+using Robust.Shared.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.GameStates;
 
-namespace Content.Shared.Species.Components;
+namespace Content.Shared.Species.Diona.Components;
 
 [RegisterComponent, NetworkedComponent, AutoGenerateComponentState]
 public sealed partial class ReformComponent : Component
@@ -13,7 +13,7 @@ public sealed partial class ReformComponent : Component
     [DataField(required: true)]
     public EntProtoId ActionPrototype = default!;
 
-    [DataField, AutoNetworkedField] 
+    [DataField, AutoNetworkedField]
     public EntityUid? ActionEntity;
 
     /// <summary>

Content.Shared/Species/Systems/ReformSystem.cs → Content.Shared/Species/Diona/Systems/ReformSystem.cs

@@ -1,4 +1,4 @@
-using Content.Shared.Species.Components;
+using Content.Shared.Species.Diona.Components;
 using Content.Shared.Actions;
 using Content.Shared.DoAfter;
 using Content.Shared.Popups;
@@ -10,7 +10,7 @@
 using Robust.Shared.Serialization;
 using Robust.Shared.Timing;
 
-namespace Content.Shared.Species;
+namespace Content.Shared.Species.Diona.Systems;
 
 public sealed partial class ReformSystem : EntitySystem
 {
@@ -89,7 +89,7 @@ private void OnDoAfter(EntityUid uid, ReformComponent comp, ReformDoAfterEvent a
             return;
 
         // Spawn a new entity
-        // This is, to an extent, taken from polymorph. I don't use polymorph for various reasons- most notably that this is permanent. 
+        // This is, to an extent, taken from polymorph. I don't use polymorph for various reasons- most notably that this is permanent.
         var child = Spawn(comp.ReformPrototype, Transform(uid).Coordinates);
 
         // This transfers the mind to the new entity
@@ -105,8 +105,8 @@ private void OnZombified(EntityUid uid, ReformComponent comp, ref EntityZombifie
         _actionsSystem.RemoveAction(uid, comp.ActionEntity); // Zombies can't reform
     }
 
-    public sealed partial class ReformEvent : InstantActionEvent { } 
-    
+    public sealed partial class ReformEvent : InstantActionEvent { }
+
     [Serializable, NetSerializable]
     public sealed partial class ReformDoAfterEvent : SimpleDoAfterEvent { }
 }

Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs → Content.Shared/Species/Felinids/Components/PseudoItemComponent.cs

@@ -1,7 +1,7 @@
 using Content.Shared.Item;
 using Robust.Shared.Prototypes;
 
-namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
+namespace Content.Shared.Species.Felinids.Components;
 
     /// <summary>
     /// For entities that behave like an item under certain conditions,

Content.Shared/Species/Felinids/Systems/HairballActionEvent.cs

@@ -0,0 +1,5 @@
+using Content.Shared.Actions;
+
+namespace Content.Shared.Species.Felinids.Systems;
+
+public sealed partial class HairballActionEvent : InstantActionEvent {}

Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs → Content.Shared/Species/Felinids/Systems/PseudoItemInsertDoAfterEvent.cs

@@ -1,7 +1,7 @@
 using Robust.Shared.Serialization;
 using Content.Shared.DoAfter;
 
-namespace Content.Shared.Item.PseudoItem;
+namespace Content.Shared.Species.Felinids.Systems;
 
 
 [Serializable, NetSerializable]

Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs → Content.Shared/Species/Felinids/Systems/SharedPseudoItemSystem.Checks.cs

@@ -1,7 +1,8 @@
 using Content.Shared.Item;
 using Content.Shared.Storage;
+using Content.Shared.Species.Felinids.Components;
 
-namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
+namespace Content.Shared.Species.Felinids.Systems;
 
 /// <summary>
 /// Almost all of this is code taken from other systems, but adapted to use PseudoItem.

Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs → Content.Shared/Species/Felinids/Systems/SharedPseudoItemSystem.cs

@@ -3,14 +3,14 @@
 using Content.Shared.IdentityManagement;
 using Content.Shared.Interaction.Events;
 using Content.Shared.Item;
-using Content.Shared.Item.PseudoItem;
+using Content.Shared.Species.Felinids.Components;
 using Content.Shared.Storage;
 using Content.Shared.Storage.EntitySystems;
 using Content.Shared.Tag;
 using Content.Shared.Verbs;
 using Robust.Shared.Containers;
 
-namespace Content.Shared.Nyanotrasen.Item.PseudoItem;
+namespace Content.Shared.Species.Felinids.Systems;
 
 public abstract partial class SharedPseudoItemSystem : EntitySystem
 {

Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs → Content.Shared/Species/Harpy/Components/HarpySingerComponent.cs

@@ -3,7 +3,7 @@
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.DeltaV.Harpy
+namespace Content.Shared.Species.Harpy.Components
 {
     [RegisterComponent, NetworkedComponent]
     public sealed partial class HarpySingerComponent : Component

Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs → Content.Shared/Species/Harpy/Components/HarpyVisualComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.DeltaV.Harpy.Components
+namespace Content.Shared.Species.Harpy.Components
 {
     [Serializable, NetSerializable]
     public enum HarpyVisualLayers

Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs → Content.Shared/Species/Harpy/Components/SharedHarpyVisualsComponent.cs

@@ -1,6 +1,6 @@
 using Robust.Shared.Serialization;
 
-namespace Content.Shared.DeltaV.Harpy;
+namespace Content.Shared.Species.Harpy.Components;
 
 [Serializable, NetSerializable]
 public enum HardsuitWings : byte

Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs → Content.Shared/Species/Harpy/Systems/HarpySingerSystem.cs

@@ -1,8 +1,9 @@
 using Content.Shared.Actions;
+using Content.Shared.Species.Harpy.Components;
 
 namespace Content.Shared.DeltaV.Harpy
 {
-    public class HarpySingerSystem : EntitySystem
+    public sealed class HarpySingerSystem : EntitySystem
     {
         [Dependency] private readonly SharedActionsSystem _actionsSystem = default!;
 

Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs → Content.Shared/Species/Harpy/Systems/HarpyVisualsSystem.cs

@@ -1,3 +1,4 @@
+using Content.Shared.Species.Harpy.Components;
 using Content.Shared.Inventory.Events;
 using Content.Shared.Tag;
 using Content.Shared.Humanoid;