diff --git a/Content.Client/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Client/Species/Felinids/Systems/PseudoItemSystem.cs similarity index 69% rename from Content.Client/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs rename to Content.Client/Species/Felinids/Systems/PseudoItemSystem.cs index f9427362a66..e4c4fe06ef7 100644 --- a/Content.Client/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs +++ b/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; diff --git a/Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs b/Content.Client/Species/Harpy/Components/HarpyVisualsComponent.cs similarity index 63% rename from Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs rename to Content.Client/Species/Harpy/Components/HarpyVisualsComponent.cs index 1c3253c74ef..06c473b6bf2 100644 --- a/Content.Client/DeltaV/Harpy/HarpyVisualsComponent.cs +++ b/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 diff --git a/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs b/Content.Client/Species/Harpy/Systems/UltraVisionOverlay.cs similarity index 96% rename from Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs rename to Content.Client/Species/Harpy/Systems/UltraVisionOverlay.cs index 73c05e052b6..dc2e7a7ed2f 100644 --- a/Content.Client/DeltaV/Overlays/UltraVisionOverlay.cs +++ b/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 { diff --git a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs b/Content.Client/Species/Harpy/Systems/UltraVisionSystem.cs similarity index 96% rename from Content.Client/DeltaV/Overlays/UltraVisionSystem.cs rename to Content.Client/Species/Harpy/Systems/UltraVisionSystem.cs index b89ffd15263..63e0c0df8e9 100644 --- a/Content.Client/DeltaV/Overlays/UltraVisionSystem.cs +++ b/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 { diff --git a/Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs b/Content.Client/Species/Vulpkanin/Systems/DogVisionOverlay.cs similarity index 93% rename from Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs rename to Content.Client/Species/Vulpkanin/Systems/DogVisionOverlay.cs index 95cfc683e09..58d4fc7325d 100644 --- a/Content.Client/Nyanotrasen/Overlays/DogVisionOverlay.cs +++ b/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 { diff --git a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs b/Content.Client/Species/Vulpkanin/Systems/DogVisionSystem.cs similarity index 92% rename from Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs rename to Content.Client/Species/Vulpkanin/Systems/DogVisionSystem.cs index 2da90e877ed..936974e17bb 100644 --- a/Content.Client/Nyanotrasen/Overlays/DogVisionSystem.cs +++ b/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 { diff --git a/Content.Server/Radio/EntitySystems/RadioSystem.cs b/Content.Server/Radio/EntitySystems/RadioSystem.cs index e2a61b5022b..262cedc1075 100644 --- a/Content.Server/Radio/EntitySystems/RadioSystem.cs +++ b/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; diff --git a/Content.Server/Species/Systems/NymphSystem.cs b/Content.Server/Species/Diona/Systems/NymphSystem.cs similarity index 94% rename from Content.Server/Species/Systems/NymphSystem.cs rename to Content.Server/Species/Diona/Systems/NymphSystem.cs index b7751afbf18..0aa27f501af 100644 --- a/Content.Server/Species/Systems/NymphSystem.cs +++ b/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 { diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs b/Content.Server/Species/Felinids/Components/CoughingUpHairballComponent.cs similarity index 83% rename from Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs rename to Content.Server/Species/Felinids/Components/CoughingUpHairballComponent.cs index 1bfa0809b63..8d4364ce389 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/CoughingUpHairballComponent.cs +++ b/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 diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs b/Content.Server/Species/Felinids/Components/FelinidComponent.cs similarity index 95% rename from Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs rename to Content.Server/Species/Felinids/Components/FelinidComponent.cs index 9165b90de05..9175e073800 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidComponent.cs +++ b/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 diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs b/Content.Server/Species/Felinids/Components/FelinidFoodComponent.cs similarity index 61% rename from Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs rename to Content.Server/Species/Felinids/Components/FelinidFoodComponent.cs index 5a6069ffab0..fbbfa7e146d 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidFoodComponent.cs +++ b/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 diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs b/Content.Server/Species/Felinids/Components/HairballComponent.cs similarity index 70% rename from Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs rename to Content.Server/Species/Felinids/Components/HairballComponent.cs index 01c01dbc2e5..b8da7fe2481 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/HairballComponent.cs +++ b/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 diff --git a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs b/Content.Server/Species/Felinids/Systems/FelinidSystem.cs similarity index 98% rename from Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs rename to Content.Server/Species/Felinids/Systems/FelinidSystem.cs index b79b9a1bec4..264357165ca 100644 --- a/Content.Server/Nyanotrasen/Abilities/Felinid/FelinidSystem.cs +++ b/Content.Server/Species/Felinids/Systems/FelinidSystem.cs @@ -9,6 +9,7 @@ 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; @@ -16,6 +17,7 @@ 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; @@ -23,7 +25,7 @@ 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 { diff --git a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs b/Content.Server/Species/Felinids/Systems/PseudoItemSystem.cs similarity index 91% rename from Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs rename to Content.Server/Species/Felinids/Systems/PseudoItemSystem.cs index 76cfe7d904b..ba04deac6d7 100644 --- a/Content.Server/Nyanotrasen/Item/PseudoItem/PseudoItemSystem.cs +++ b/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 { diff --git a/Content.Server/DeltaV/VoiceMask/SyrinxVoiceMaskComponent.cs b/Content.Server/Species/Harpy/Components/SyrinxVoiceMaskComponent.cs similarity index 82% rename from Content.Server/DeltaV/VoiceMask/SyrinxVoiceMaskComponent.cs rename to Content.Server/Species/Harpy/Components/SyrinxVoiceMaskComponent.cs index 97c04039f92..7efebadd8d3 100644 --- a/Content.Server/DeltaV/VoiceMask/SyrinxVoiceMaskComponent.cs +++ b/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 diff --git a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Server/Species/Harpy/Systems/HarpySingerSystem.cs similarity index 98% rename from Content.Server/DeltaV/Harpy/HarpySingerSystem.cs rename to Content.Server/Species/Harpy/Systems/HarpySingerSystem.cs index 21b5b3a2456..0274b82ca25 100644 --- a/Content.Server/DeltaV/Harpy/HarpySingerSystem.cs +++ b/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 { diff --git a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs b/Content.Server/Species/Harpy/Systems/SubdermalBionicSyrinxImplantSystem.cs similarity index 97% rename from Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs rename to Content.Server/Species/Harpy/Systems/SubdermalBionicSyrinxImplantSystem.cs index 65678668d7d..af2efedadc2 100644 --- a/Content.Server/DeltaV/Implants/SubdermalBionicSyrinxImplantSystem.cs +++ b/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 { diff --git a/Content.Server/Nyanotrasen/Abilities/Oni/HeldbyOniComponent.cs b/Content.Server/Species/Oni/Components/HeldbyOniComponent.cs similarity index 75% rename from Content.Server/Nyanotrasen/Abilities/Oni/HeldbyOniComponent.cs rename to Content.Server/Species/Oni/Components/HeldbyOniComponent.cs index 41ec3fa630e..637e2d0315b 100644 --- a/Content.Server/Nyanotrasen/Abilities/Oni/HeldbyOniComponent.cs +++ b/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 diff --git a/Content.Server/Nyanotrasen/Abilities/Oni/OniComponent.cs b/Content.Server/Species/Oni/Components/OniComponent.cs similarity index 87% rename from Content.Server/Nyanotrasen/Abilities/Oni/OniComponent.cs rename to Content.Server/Species/Oni/Components/OniComponent.cs index af18a8021d4..01f9892d6b7 100644 --- a/Content.Server/Nyanotrasen/Abilities/Oni/OniComponent.cs +++ b/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 diff --git a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs b/Content.Server/Species/Oni/Systems/OniSystem.cs similarity index 95% rename from Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs rename to Content.Server/Species/Oni/Systems/OniSystem.cs index 6fdb27097e9..20d114c87ec 100644 --- a/Content.Server/Nyanotrasen/Abilities/Oni/OniSystem.cs +++ b/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 { diff --git a/Content.Server/Spider/SpiderSystem.cs b/Content.Server/Species/Spider/Systems/SpiderSystem.cs similarity index 93% rename from Content.Server/Spider/SpiderSystem.cs rename to Content.Server/Species/Spider/Systems/SpiderSystem.cs index 449e43984c3..681fdade2c5 100644 --- a/Content.Server/Spider/SpiderSystem.cs +++ b/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 { diff --git a/Content.Shared/Species/Components/GibActionComponent.cs b/Content.Shared/Gibbing/Components/GibActionComponent.cs similarity index 100% rename from Content.Shared/Species/Components/GibActionComponent.cs rename to Content.Shared/Gibbing/Components/GibActionComponent.cs diff --git a/Content.Shared/Species/Systems/GibActionSystem.cs b/Content.Shared/Gibbing/Systems/GibActionSystem.cs similarity index 100% rename from Content.Shared/Species/Systems/GibActionSystem.cs rename to Content.Shared/Gibbing/Systems/GibActionSystem.cs diff --git a/Content.Shared/Item/ItemComponent.cs b/Content.Shared/Item/ItemComponent.cs index 0f599ebdbed..6075ce3ee7c 100644 --- a/Content.Shared/Item/ItemComponent.cs +++ b/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; diff --git a/Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs b/Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs deleted file mode 100644 index 6cf55a224e8..00000000000 --- a/Content.Shared/Nyanotrasen/Actions/Events/HairballActionEvent.cs +++ /dev/null @@ -1,3 +0,0 @@ -namespace Content.Shared.Actions.Events; - -public sealed partial class HairballActionEvent : InstantActionEvent {} diff --git a/Content.Shared/Species/Components/NymphComponent.cs b/Content.Shared/Species/Diona/Components/NymphComponent.cs similarity index 90% rename from Content.Shared/Species/Components/NymphComponent.cs rename to Content.Shared/Species/Diona/Components/NymphComponent.cs index e8fe2f367e2..e15e1998f77 100644 --- a/Content.Shared/Species/Components/NymphComponent.cs +++ b/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; /// /// 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. /// [RegisterComponent, NetworkedComponent] diff --git a/Content.Shared/Species/Components/ReformComponent.cs b/Content.Shared/Species/Diona/Components/ReformComponent.cs similarity index 91% rename from Content.Shared/Species/Components/ReformComponent.cs rename to Content.Shared/Species/Diona/Components/ReformComponent.cs index 724c9dc3302..c1d74619936 100644 --- a/Content.Shared/Species/Components/ReformComponent.cs +++ b/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; /// diff --git a/Content.Shared/Species/Systems/ReformSystem.cs b/Content.Shared/Species/Diona/Systems/ReformSystem.cs similarity index 97% rename from Content.Shared/Species/Systems/ReformSystem.cs rename to Content.Shared/Species/Diona/Systems/ReformSystem.cs index dc2ce3fb900..61e3eef252a 100644 --- a/Content.Shared/Species/Systems/ReformSystem.cs +++ b/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 { } } diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs b/Content.Shared/Species/Felinids/Components/PseudoItemComponent.cs similarity index 93% rename from Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs rename to Content.Shared/Species/Felinids/Components/PseudoItemComponent.cs index d3774439d36..9c1e79ede57 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItem/PseudoItemComponent.cs +++ b/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; /// /// For entities that behave like an item under certain conditions, diff --git a/Content.Shared/Species/Felinids/Systems/HairballActionEvent.cs b/Content.Shared/Species/Felinids/Systems/HairballActionEvent.cs new file mode 100644 index 00000000000..1d30dd734d8 --- /dev/null +++ b/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 {} diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs b/Content.Shared/Species/Felinids/Systems/PseudoItemInsertDoAfterEvent.cs similarity index 78% rename from Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs rename to Content.Shared/Species/Felinids/Systems/PseudoItemInsertDoAfterEvent.cs index daff55d2770..01ec44c00a0 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItemInsertDoAfterEvent.cs +++ b/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] diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs b/Content.Shared/Species/Felinids/Systems/SharedPseudoItemSystem.Checks.cs similarity index 98% rename from Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs rename to Content.Shared/Species/Felinids/Systems/SharedPseudoItemSystem.Checks.cs index 7000c654048..494934e6bb8 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.Checks.cs +++ b/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; /// /// Almost all of this is code taken from other systems, but adapted to use PseudoItem. diff --git a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs b/Content.Shared/Species/Felinids/Systems/SharedPseudoItemSystem.cs similarity index 98% rename from Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs rename to Content.Shared/Species/Felinids/Systems/SharedPseudoItemSystem.cs index 4b7910746f1..77a7f34b744 100644 --- a/Content.Shared/Nyanotrasen/Item/PseudoItem/SharedPseudoItemSystem.cs +++ b/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 { diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs b/Content.Shared/Species/Harpy/Components/HarpySingerComponent.cs similarity index 92% rename from Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs rename to Content.Shared/Species/Harpy/Components/HarpySingerComponent.cs index f2edeeb8726..7bcb31ad9c6 100644 --- a/Content.Shared/DeltaV/Harpy/HarpySingerComponent.cs +++ b/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 diff --git a/Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs b/Content.Shared/Species/Harpy/Components/HarpyVisualComponent.cs similarity index 83% rename from Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs rename to Content.Shared/Species/Harpy/Components/HarpyVisualComponent.cs index f5100e13c7f..336a4a3cc98 100644 --- a/Content.Shared/DeltaV/Harpy/Components/HarpyVisualSystem.cs +++ b/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 diff --git a/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs b/Content.Shared/Species/Harpy/Components/SharedHarpyVisualsComponent.cs similarity index 69% rename from Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs rename to Content.Shared/Species/Harpy/Components/SharedHarpyVisualsComponent.cs index cc0f7c39354..1f0ab45befc 100644 --- a/Content.Shared/DeltaV/Harpy/SharedHarpyVisualsComponent.cs +++ b/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 diff --git a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs b/Content.Shared/Species/Harpy/Systems/HarpySingerSystem.cs similarity index 89% rename from Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs rename to Content.Shared/Species/Harpy/Systems/HarpySingerSystem.cs index 50e8b6302c0..815f8b01ef1 100644 --- a/Content.Shared/DeltaV/Harpy/HarpySingerSystem.cs +++ b/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!; diff --git a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs b/Content.Shared/Species/Harpy/Systems/HarpyVisualsSystem.cs similarity index 96% rename from Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs rename to Content.Shared/Species/Harpy/Systems/HarpyVisualsSystem.cs index f75fcee8d42..f0aace440b2 100644 --- a/Content.Shared/DeltaV/Harpy/HarpyVisualsSystem.cs +++ b/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; diff --git a/Content.Shared/Nyanotrasen/Abilities/Oni/SharedOniSystem.cs b/Content.Shared/Species/Oni/Systems/SharedOniSystem.cs similarity index 51% rename from Content.Shared/Nyanotrasen/Abilities/Oni/SharedOniSystem.cs rename to Content.Shared/Species/Oni/Systems/SharedOniSystem.cs index 874213aa5c5..39ded988ea2 100644 --- a/Content.Shared/Nyanotrasen/Abilities/Oni/SharedOniSystem.cs +++ b/Content.Shared/Species/Oni/Systems/SharedOniSystem.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Nyanotrasen.Abilities.Oni; +namespace Content.Shared.Species.Oni.Systems; public abstract class SharedOniSystem : EntitySystem { diff --git a/Content.Shared/Spider/IgnoreSpiderWebComponent.cs b/Content.Shared/Species/Spider/Components/IgnoreSpiderWebComponent.cs similarity index 63% rename from Content.Shared/Spider/IgnoreSpiderWebComponent.cs rename to Content.Shared/Species/Spider/Components/IgnoreSpiderWebComponent.cs index 55eb1aa50f0..5c5d9e9ea82 100644 --- a/Content.Shared/Spider/IgnoreSpiderWebComponent.cs +++ b/Content.Shared/Species/Spider/Components/IgnoreSpiderWebComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Spider; +namespace Content.Shared.Species.Spider.Components; [RegisterComponent] public sealed partial class IgnoreSpiderWebComponent : Component diff --git a/Content.Shared/Spider/SpiderComponent.cs b/Content.Shared/Species/Spider/Components/SpiderComponent.cs similarity index 89% rename from Content.Shared/Spider/SpiderComponent.cs rename to Content.Shared/Species/Spider/Components/SpiderComponent.cs index 42213adcb10..98266cffeaa 100644 --- a/Content.Shared/Spider/SpiderComponent.cs +++ b/Content.Shared/Species/Spider/Components/SpiderComponent.cs @@ -1,9 +1,10 @@ using Content.Shared.Actions; +using Content.Shared.Species.Spider.Systems; using Robust.Shared.GameStates; using Robust.Shared.Prototypes; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; -namespace Content.Shared.Spider; +namespace Content.Shared.Species.Spider.Components; [RegisterComponent, NetworkedComponent] [Access(typeof(SharedSpiderSystem))] diff --git a/Content.Shared/Spider/SpiderWebObjectComponent.cs b/Content.Shared/Species/Spider/Components/SpiderWebObjectComponent.cs similarity index 64% rename from Content.Shared/Spider/SpiderWebObjectComponent.cs rename to Content.Shared/Species/Spider/Components/SpiderWebObjectComponent.cs index 3f05888083d..1008802fba5 100644 --- a/Content.Shared/Spider/SpiderWebObjectComponent.cs +++ b/Content.Shared/Species/Spider/Components/SpiderWebObjectComponent.cs @@ -1,6 +1,7 @@ +using Content.Shared.Species.Spider.Systems; using Robust.Shared.GameStates; -namespace Content.Shared.Spider; +namespace Content.Shared.Species.Spider.Components; [RegisterComponent, NetworkedComponent] [Access(typeof(SharedSpiderSystem))] diff --git a/Content.Shared/Spider/SpiderWebVisualsComponent.cs b/Content.Shared/Species/Spider/Components/SpiderWebVisualsComponent.cs similarity index 68% rename from Content.Shared/Spider/SpiderWebVisualsComponent.cs rename to Content.Shared/Species/Spider/Components/SpiderWebVisualsComponent.cs index 2d6fb588159..e4cdc4322e7 100644 --- a/Content.Shared/Spider/SpiderWebVisualsComponent.cs +++ b/Content.Shared/Species/Spider/Components/SpiderWebVisualsComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared.Spider; +namespace Content.Shared.Species.Spider.Components; [Serializable, NetSerializable] public enum SpiderWebVisuals diff --git a/Content.Shared/Spider/SharedSpiderSystem.cs b/Content.Shared/Species/Spider/Systems/SharedSpiderSystem.cs similarity index 91% rename from Content.Shared/Spider/SharedSpiderSystem.cs rename to Content.Shared/Species/Spider/Systems/SharedSpiderSystem.cs index 33473303aa9..3291fdb773c 100644 --- a/Content.Shared/Spider/SharedSpiderSystem.cs +++ b/Content.Shared/Species/Spider/Systems/SharedSpiderSystem.cs @@ -1,8 +1,9 @@ using Content.Shared.Actions; +using Content.Shared.Species.Spider.Components; using Robust.Shared.Network; using Robust.Shared.Random; -namespace Content.Shared.Spider; +namespace Content.Shared.Species.Spider.Systems; public abstract class SharedSpiderSystem : EntitySystem { diff --git a/Content.Shared/Nyanotrasen/Abilities/DogVisionComponent.cs b/Content.Shared/Species/Vulpkanin/Components/DogVisionComponent.cs similarity index 71% rename from Content.Shared/Nyanotrasen/Abilities/DogVisionComponent.cs rename to Content.Shared/Species/Vulpkanin/Components/DogVisionComponent.cs index b0cf6cf0d1e..cfc64def812 100644 --- a/Content.Shared/Nyanotrasen/Abilities/DogVisionComponent.cs +++ b/Content.Shared/Species/Vulpkanin/Components/DogVisionComponent.cs @@ -1,5 +1,5 @@ using Robust.Shared.GameStates; -namespace Content.Shared.Abilities; +namespace Content.Shared.Species.Vulpkanin.Components; [RegisterComponent] [NetworkedComponent] diff --git a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs index 11075b4a4c7..d44fc606a15 100644 --- a/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs +++ b/Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs @@ -11,7 +11,7 @@ using Content.Shared.Interaction; using Content.Shared.Item; using Content.Shared.Lock; -using Content.Shared.Nyanotrasen.Item.PseudoItem; +using Content.Shared.Species.Felinids.Components; using Content.Shared.Placeable; using Content.Shared.Popups; using Content.Shared.Stacks; diff --git a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs index 0183a30a73b..3b282a40f55 100644 --- a/Content.Shared/Weapons/Ranged/Components/GunComponent.cs +++ b/Content.Shared/Weapons/Ranged/Components/GunComponent.cs @@ -1,5 +1,5 @@ using Content.Shared.Damage; -using Content.Shared.Nyanotrasen.Abilities.Oni; +using Content.Shared.Species.Oni.Systems; using Content.Shared.Tag; using Content.Shared.Weapons.Ranged.Events; using Content.Shared.Weapons.Ranged.Systems; diff --git a/Resources/ConfigPresets/DeltaV/apoapsis.toml b/Resources/ConfigPresets/DeltaV/apoapsis.toml deleted file mode 100644 index 7ba1d0f282e..00000000000 --- a/Resources/ConfigPresets/DeltaV/apoapsis.toml +++ /dev/null @@ -1,21 +0,0 @@ -[game] -hostname = "[EN][MRP] Delta-v (Ψ) | Apoapsis" -soft_max_players = 100 - -[server] -rules_file = "Rules.txt" -rules_header = "ui-rules-header" - -[whitelist] -enabled = false -reason = "whitelist-not-whitelisted" -min_players = 90 - -[shuttle] -emergency_early_launch_allowed = true - -[hub] -tags = "lang:en-US,region:am_n_e,rp:med" - -[atmos] -monstermos_rip_tiles = false diff --git a/Resources/ConfigPresets/DeltaV/deltav.toml b/Resources/ConfigPresets/DeltaV/deltav.toml deleted file mode 100644 index f784373d715..00000000000 --- a/Resources/ConfigPresets/DeltaV/deltav.toml +++ /dev/null @@ -1,48 +0,0 @@ -[game] -desc = "Featuring loads of unique content and psionics." -lobbyenabled = true -lobbyduration = 240 -round_end_pacifist = true - -[infolinks] -discord = "https://go.delta-v.org/sxzqj" -github = "https://github.com/DeltaV-Station/Delta-v" -website = "https://www.delta-v.org/" -wiki = "https://wiki.delta-v.org/view/Main_Page" -patreon = "https://www.patreon.com/Delta_v" -bug_report = "https://github.com/DeltaV-Station/Delta-v/issues/new/choose" -forum = "https://forum.delta-v.org/" -appeal = "https://go.delta-v.org/appeal" - -[net] -max_connections = 1024 -tickrate = 30 - -[vote] -restart_required_ratio = 0.7 - -[netres] -limit = 10.0 - -[admin] -see_own_notes = true -deadmin_on_join = true - -[events] -ramping_average_end_time = 180.0 -ramping_average_chaos = 4.5 - -[atmos] -monstermos_rip_tiles = false - -[server] -id = "deltav" - -[discord] -rich_main_icon_id = "deltav" - -[ic] -flavor_text = true - -#[worldgen] -#enabled = true diff --git a/Resources/ConfigPresets/DeltaV/inclination.toml b/Resources/ConfigPresets/DeltaV/inclination.toml deleted file mode 100644 index c655bb796c0..00000000000 --- a/Resources/ConfigPresets/DeltaV/inclination.toml +++ /dev/null @@ -1,17 +0,0 @@ -[game] -hostname = "[EN][EU][MRP] Delta-v (Ψ) | Inclination" -soft_max_players = 50 - -[server] -rules_file = "Rules.txt" -rules_header = "ui-rules-header" - -[vote] -preset_enabled = true -map_enabled = true - -[ooc] -enable_during_round = true - -[hub] -tags = "lang:en-US,region:eu_w,rp:med" diff --git a/Resources/ConfigPresets/DeltaV/periapsis.toml b/Resources/ConfigPresets/DeltaV/periapsis.toml deleted file mode 100644 index ad6cae56283..00000000000 --- a/Resources/ConfigPresets/DeltaV/periapsis.toml +++ /dev/null @@ -1,22 +0,0 @@ -[game] -hostname = "[EN][MRP] Delta-v (Ψ) | Periapsis" -soft_max_players = 50 - -[server] -rules_file = "Rules.txt" -rules_header = "ui-rules-header" - -[vote] -preset_enabled = true -map_enabled = true - -[whitelist] -enabled = false -reason = "whitelist-not-whitelisted-peri" -min_players = 10 - -[ooc] -enable_during_round = true - -[hub] -tags = "lang:en-US,region:am_n_e,rp:med" diff --git a/Resources/Credits/Patrons.yml b/Resources/Credits/Patrons.yml deleted file mode 100644 index ff98e134cec..00000000000 --- a/Resources/Credits/Patrons.yml +++ /dev/null @@ -1,58 +0,0 @@ -- Name: "weirdrock" - Tier: Captain -- Name: "Drifter Drifter" - Tier: Captain -- Name: "Bikowu" - Tier: Assistant -- Name: "Hasan al-Binabi" - Tier: Central Commander -- Name: "lleft The Dragon" - Tier: Central Commander -- Name: "Pandaconda" - Tier: Assistant -- Name: "Lazhannya" - Tier: Captain -- Name: "Bonktrauma" - Tier: Captain -- Name: "Haltell" - Tier: Captain -- Name: "Delta.Pizza" - Tier: Captain -- Name: "steph kaus" - Tier: Captain -- Name: "HyperionGM" - Tier: Central Commander -- Name: "MikeAndIkes" - Tier: Assistant -- Name: "Ashley" - Tier: Central Commander -- Name: "mura" - Tier: Captain -- Name: "Adeinitas" - Tier: Captain -- Name: "Shock" - Tier: Captain -- Name: "Dead Rabbit" - Tier: Captain -- Name: "T-Dog" - Tier: Captain -- Name: "oBerry" - Tier: Central Commander -- Name: "Wakefield" - Tier: Captain -- Name: "Hûvy" - Tier: Assistant -- Name: "TheGungeonologist" - Tier: Central Commander -- Name: "Ethan" - Tier: Captain -- Name: "TeeJay Neuroth" - Tier: Captain -- Name: "Neptunia_Counseling" - Tier: Central Commander -- Name: "rosysyntax" - Tier: Assistant -- Name: "Kurzaen" - Tier: Captain -- Name: "tokie" - Tier: Central Commander diff --git a/Resources/map_attributions.txt b/Resources/map_attributions.txt index 602d6cb34f9..f27c299ef94 100644 --- a/Resources/map_attributions.txt +++ b/Resources/map_attributions.txt @@ -1,48 +1,10 @@ -- files: ["aspid.yml"] - authors: Checkraze - -- files: ["bagel.yml"] - authors: Emisse - -- files: ["barratry.yml"] - authors: Emogarbage, Scribbles0 - -- files: ["box.yml"] - authors: ACJM, Emisse - files: ["centcomm.yml"] authors: Emisse -- files: ["cluster.yml"] - authors: Scribbles0 - -- files: ["fland.yml"] - authors: Emisse - - files: ["infiltrator.yml"] authors: DogZeroX, Emisse -- files: ["kettle.yml"] - authors: Checkraze - -- files: ["marathon.yml"] - authors: Emisse - -- files: ["moose.yml"] - authors: checkraze - - files: ["nukieplanet.yml"] authors: DogZeroX, Emisse, metalgearsloth -- files: ["omega.yml"] - authors: Emisse - -- files: ["origin.yml"] - authors: brainfood1183 - -- files: ["saltern.yml"] - authors: deltanedas, Emisse, PJB - -- files: ["core.yml"] - authors: Ubaser -