From 5163f7236721aafac90b788392377582e3fd01b5 Mon Sep 17 00:00:00 2001 From: Lyndomen <49795619+Lyndomen@users.noreply.github.com> Date: Thu, 30 Jan 2025 14:21:31 -0500 Subject: [PATCH] namespace --- .../{_EE => _DV}/Cocoon/CocoonSystem.cs | 6 ++-- .../{_EE => _DV}/Cocoon/CocoonerSystem.cs | 28 +++++++++--------- .../Vampire/BloodSuckedComponent.cs | 2 +- .../Vampire/BloodSuckerComponent.cs | 2 +- .../{_EE => _DV}/Vampire/BloodSuckerSystem.cs | 26 ++++++++-------- .../BloodSuckerGlandInjectorComponent.cs | 2 +- .../BloodSuckerGlandInjectorSystem.cs | 3 +- .../{_EE => _DV}/Cocoon/CocoonComponent.cs | 2 +- .../{_EE => _DV}/Cocoon/CocoonDoAfterEvent.cs | 4 +-- .../{_EE => _DV}/Cocoon/CocoonerComponent.cs | 2 +- .../Vampiric/BloodSuckDoAfterEvent.cs | 4 +-- .../Entities/Body/Mechanisms/vampiric.yml | 0 .../Entities/Body/Parts/spider.yml | 0 .../Entities/Body/Prototypes/arachne.yml | 0 .../Body/Prototypes/vampiricanimal.yml | 0 .../Entities/Structures/Webbing/webs.yml | 0 .../Mobs/Species/arachne.rsi/meta.json | 0 .../Mobs/Species/arachne.rsi/spider_body.png | Bin .../Species/arachne.rsi/spider_body_front.png | Bin .../Mobs/Species/eyes.rsi/eyes.png | Bin .../Mobs/Species/eyes.rsi/meta.json | 0 .../Structures/cocoon.rsi/cocoon1.png | Bin .../Structures/cocoon.rsi/cocoon2.png | Bin .../Structures/cocoon.rsi/cocoon3.png | Bin .../Structures/cocoon.rsi/cocoon_large1.png | Bin .../Structures/cocoon.rsi/cocoon_large2.png | Bin .../Structures/cocoon.rsi/cocoon_large3.png | Bin .../Structures/cocoon.rsi/meta.json | 0 28 files changed, 40 insertions(+), 41 deletions(-) rename Content.Client/{_EE => _DV}/Cocoon/CocoonSystem.cs (95%) rename Content.Server/{_EE => _DV}/Cocoon/CocoonerSystem.cs (98%) rename Content.Server/{_EE => _DV}/Vampire/BloodSuckedComponent.cs (82%) rename Content.Server/{_EE => _DV}/Vampire/BloodSuckerComponent.cs (97%) rename Content.Server/{_EE => _DV}/Vampire/BloodSuckerSystem.cs (98%) rename Content.Server/{_EE => _DV}/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs (92%) rename Content.Server/{_EE => _DV}/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs (95%) rename Content.Shared/{_EE => _DV}/Cocoon/CocoonComponent.cs (87%) rename Content.Shared/{_EE => _DV}/Cocoon/CocoonDoAfterEvent.cs (89%) rename Content.Shared/{_EE => _DV}/Cocoon/CocoonerComponent.cs (90%) rename Content.Shared/{_EE => _DV}/Vampiric/BloodSuckDoAfterEvent.cs (83%) rename Resources/Prototypes/{Nyanotrasen => _DV}/Entities/Body/Mechanisms/vampiric.yml (100%) rename Resources/Prototypes/{Nyanotrasen => _DV}/Entities/Body/Parts/spider.yml (100%) rename Resources/Prototypes/{Nyanotrasen => _DV}/Entities/Body/Prototypes/arachne.yml (100%) rename Resources/Prototypes/{Nyanotrasen => _DV}/Entities/Body/Prototypes/vampiricanimal.yml (100%) rename Resources/Prototypes/{Nyanotrasen => _DV}/Entities/Structures/Webbing/webs.yml (100%) rename Resources/Textures/{_EE => _DV}/Mobs/Species/arachne.rsi/meta.json (100%) rename Resources/Textures/{_EE => _DV}/Mobs/Species/arachne.rsi/spider_body.png (100%) rename Resources/Textures/{_EE => _DV}/Mobs/Species/arachne.rsi/spider_body_front.png (100%) rename Resources/Textures/{_EE => _DV}/Mobs/Species/eyes.rsi/eyes.png (100%) rename Resources/Textures/{_EE => _DV}/Mobs/Species/eyes.rsi/meta.json (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/cocoon1.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/cocoon2.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/cocoon3.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/cocoon_large1.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/cocoon_large2.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/cocoon_large3.png (100%) rename Resources/Textures/{Nyanotrasen => _DV}/Structures/cocoon.rsi/meta.json (100%) diff --git a/Content.Client/_EE/Cocoon/CocoonSystem.cs b/Content.Client/_DV/Cocoon/CocoonSystem.cs similarity index 95% rename from Content.Client/_EE/Cocoon/CocoonSystem.cs rename to Content.Client/_DV/Cocoon/CocoonSystem.cs index f6b66a4b395..85a1fd223a7 100644 --- a/Content.Client/_EE/Cocoon/CocoonSystem.cs +++ b/Content.Client/_DV/Cocoon/CocoonSystem.cs @@ -1,10 +1,10 @@ -using Content.Shared.Cocoon; +using System.Numerics; +using Content.Shared._DV.Cocoon; using Content.Shared.Humanoid; using Robust.Client.GameObjects; using Robust.Shared.Containers; -using System.Numerics; -namespace Content.Client.Cocoon +namespace Content.Client._DV.Cocoon { public sealed class CocoonSystem : EntitySystem { diff --git a/Content.Server/_EE/Cocoon/CocoonerSystem.cs b/Content.Server/_DV/Cocoon/CocoonerSystem.cs similarity index 98% rename from Content.Server/_EE/Cocoon/CocoonerSystem.cs rename to Content.Server/_DV/Cocoon/CocoonerSystem.cs index 9a10d9f5a79..393370cff15 100644 --- a/Content.Server/_EE/Cocoon/CocoonerSystem.cs +++ b/Content.Server/_DV/Cocoon/CocoonerSystem.cs @@ -1,26 +1,26 @@ -using Content.Shared.Cocoon; -using Content.Shared.IdentityManagement; -using Content.Shared.Verbs; -using Content.Shared.DoAfter; -using Content.Shared.Stunnable; -using Content.Shared.Eye.Blinding.Systems; +using Content.Server.DoAfter; +using Content.Server.Popups; +using Content.Server.Speech.Components; +using Content.Shared._DV.Cocoon; +using Content.Shared.Administration.Logs; using Content.Shared.Containers.ItemSlots; using Content.Shared.Damage; -using Content.Shared.Administration.Logs; using Content.Shared.Database; +using Content.Shared.Destructible; +using Content.Shared.DoAfter; +using Content.Shared.Eye.Blinding.Systems; using Content.Shared.Humanoid; -using Content.Server.Popups; -using Content.Server.DoAfter; -using Content.Server.Speech.Components; -using Robust.Shared.Containers; +using Content.Shared.IdentityManagement; using Content.Shared.Mobs.Components; -using Content.Shared.Destructible; -using Robust.Shared.Random; using Content.Shared.Nutrition.Components; using Content.Shared.Storage; +using Content.Shared.Stunnable; +using Content.Shared.Verbs; +using Robust.Shared.Containers; +using Robust.Shared.Random; using Robust.Shared.Utility; -namespace Content.Server.Cocoon +namespace Content.Server._DV.Cocoon { public sealed class CocooningSystem : EntitySystem { diff --git a/Content.Server/_EE/Vampire/BloodSuckedComponent.cs b/Content.Server/_DV/Vampire/BloodSuckedComponent.cs similarity index 82% rename from Content.Server/_EE/Vampire/BloodSuckedComponent.cs rename to Content.Server/_DV/Vampire/BloodSuckedComponent.cs index df0eb4e3d65..a86191b434c 100644 --- a/Content.Server/_EE/Vampire/BloodSuckedComponent.cs +++ b/Content.Server/_DV/Vampire/BloodSuckedComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Vampire +namespace Content.Server._DV.Vampire { /// /// For entities who have been sucked. diff --git a/Content.Server/_EE/Vampire/BloodSuckerComponent.cs b/Content.Server/_DV/Vampire/BloodSuckerComponent.cs similarity index 97% rename from Content.Server/_EE/Vampire/BloodSuckerComponent.cs rename to Content.Server/_DV/Vampire/BloodSuckerComponent.cs index e7bd70f91c5..80e5d9502f8 100644 --- a/Content.Server/_EE/Vampire/BloodSuckerComponent.cs +++ b/Content.Server/_DV/Vampire/BloodSuckerComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Vampire +namespace Content.Server._DV.Vampire { [RegisterComponent] public sealed partial class BloodSuckerComponent : Component diff --git a/Content.Server/_EE/Vampire/BloodSuckerSystem.cs b/Content.Server/_DV/Vampire/BloodSuckerSystem.cs similarity index 98% rename from Content.Server/_EE/Vampire/BloodSuckerSystem.cs rename to Content.Server/_DV/Vampire/BloodSuckerSystem.cs index 182a29f74ca..8465c85baf9 100644 --- a/Content.Server/_EE/Vampire/BloodSuckerSystem.cs +++ b/Content.Server/_DV/Vampire/BloodSuckerSystem.cs @@ -1,26 +1,26 @@ using System.Linq; -using Content.Shared.Verbs; -using Content.Shared.Damage; -using Content.Shared.DoAfter; -using Content.Shared.Damage.Prototypes; -using Content.Shared.Interaction; -using Content.Shared.Inventory; -using Content.Shared.Administration.Logs; -using Content.Shared.Vampiric; -using Content.Shared.Cocoon; using Content.Server.Atmos.Components; using Content.Server.Body.Components; using Content.Server.Body.Systems; -using Content.Shared.Chemistry.EntitySystems; -using Content.Server.Popups; using Content.Server.DoAfter; using Content.Server.Nutrition.Components; +using Content.Server.Popups; +using Content.Shared._DV.Cocoon; +using Content.Shared._DV.Vampiric; +using Content.Shared.Administration.Logs; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Damage; +using Content.Shared.Damage.Prototypes; +using Content.Shared.DoAfter; using Content.Shared.HealthExaminable; -using Robust.Shared.Prototypes; +using Content.Shared.Interaction; +using Content.Shared.Inventory; +using Content.Shared.Verbs; using Robust.Shared.Audio.Systems; +using Robust.Shared.Prototypes; using Robust.Shared.Utility; -namespace Content.Server.Vampire +namespace Content.Server._DV.Vampire { public sealed class BloodSuckerSystem : EntitySystem { diff --git a/Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs b/Content.Server/_DV/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs similarity index 92% rename from Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs rename to Content.Server/_DV/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs index 1a3c9b1588a..728618a1690 100644 --- a/Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs +++ b/Content.Server/_DV/Vampire/Injector/BloodSuckerGlandInjectorComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Server.Vampiric +namespace Content.Server._DV.Vampire.Injector { [RegisterComponent] /// diff --git a/Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs b/Content.Server/_DV/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs similarity index 95% rename from Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs rename to Content.Server/_DV/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs index 480c60218a8..8f1a721093a 100644 --- a/Content.Server/_EE/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs +++ b/Content.Server/_DV/Vampire/Injector/BloodSuckerGlandInjectorSystem.cs @@ -1,8 +1,7 @@ using Content.Server.Popups; -using Content.Server.Vampiric; using Content.Shared.Interaction; -namespace Content.Server.Vampire +namespace Content.Server._DV.Vampire.Injector { public sealed class BloodSuckerGlandInjectorSystem : EntitySystem { diff --git a/Content.Shared/_EE/Cocoon/CocoonComponent.cs b/Content.Shared/_DV/Cocoon/CocoonComponent.cs similarity index 87% rename from Content.Shared/_EE/Cocoon/CocoonComponent.cs rename to Content.Shared/_DV/Cocoon/CocoonComponent.cs index 66ba6e6dd37..c887a2e5633 100644 --- a/Content.Shared/_EE/Cocoon/CocoonComponent.cs +++ b/Content.Shared/_DV/Cocoon/CocoonComponent.cs @@ -1,4 +1,4 @@ -namespace Content.Shared.Cocoon +namespace Content.Shared._DV.Cocoon { [RegisterComponent] public sealed partial class CocoonComponent : Component diff --git a/Content.Shared/_EE/Cocoon/CocoonDoAfterEvent.cs b/Content.Shared/_DV/Cocoon/CocoonDoAfterEvent.cs similarity index 89% rename from Content.Shared/_EE/Cocoon/CocoonDoAfterEvent.cs rename to Content.Shared/_DV/Cocoon/CocoonDoAfterEvent.cs index 0b9049e9890..3bfde77a647 100644 --- a/Content.Shared/_EE/Cocoon/CocoonDoAfterEvent.cs +++ b/Content.Shared/_DV/Cocoon/CocoonDoAfterEvent.cs @@ -1,7 +1,7 @@ -using Robust.Shared.Serialization; using Content.Shared.DoAfter; +using Robust.Shared.Serialization; -namespace Content.Shared.Cocoon +namespace Content.Shared._DV.Cocoon { [Serializable, NetSerializable] public sealed partial class CocoonDoAfterEvent : SimpleDoAfterEvent diff --git a/Content.Shared/_EE/Cocoon/CocoonerComponent.cs b/Content.Shared/_DV/Cocoon/CocoonerComponent.cs similarity index 90% rename from Content.Shared/_EE/Cocoon/CocoonerComponent.cs rename to Content.Shared/_DV/Cocoon/CocoonerComponent.cs index 17cce973096..aba674fb80f 100644 --- a/Content.Shared/_EE/Cocoon/CocoonerComponent.cs +++ b/Content.Shared/_DV/Cocoon/CocoonerComponent.cs @@ -1,6 +1,6 @@ using Robust.Shared.GameStates; -namespace Content.Shared.Cocoon +namespace Content.Shared._DV.Cocoon { [RegisterComponent, NetworkedComponent] public sealed partial class CocoonerComponent : Component diff --git a/Content.Shared/_EE/Vampiric/BloodSuckDoAfterEvent.cs b/Content.Shared/_DV/Vampiric/BloodSuckDoAfterEvent.cs similarity index 83% rename from Content.Shared/_EE/Vampiric/BloodSuckDoAfterEvent.cs rename to Content.Shared/_DV/Vampiric/BloodSuckDoAfterEvent.cs index 6aadc258d73..bc780a96298 100644 --- a/Content.Shared/_EE/Vampiric/BloodSuckDoAfterEvent.cs +++ b/Content.Shared/_DV/Vampiric/BloodSuckDoAfterEvent.cs @@ -1,7 +1,7 @@ -using Robust.Shared.Serialization; using Content.Shared.DoAfter; +using Robust.Shared.Serialization; -namespace Content.Shared.Vampiric +namespace Content.Shared._DV.Vampiric { [Serializable, NetSerializable] public sealed partial class BloodSuckDoAfterEvent : SimpleDoAfterEvent diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml b/Resources/Prototypes/_DV/Entities/Body/Mechanisms/vampiric.yml similarity index 100% rename from Resources/Prototypes/Nyanotrasen/Entities/Body/Mechanisms/vampiric.yml rename to Resources/Prototypes/_DV/Entities/Body/Mechanisms/vampiric.yml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml b/Resources/Prototypes/_DV/Entities/Body/Parts/spider.yml similarity index 100% rename from Resources/Prototypes/Nyanotrasen/Entities/Body/Parts/spider.yml rename to Resources/Prototypes/_DV/Entities/Body/Parts/spider.yml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml b/Resources/Prototypes/_DV/Entities/Body/Prototypes/arachne.yml similarity index 100% rename from Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/arachne.yml rename to Resources/Prototypes/_DV/Entities/Body/Prototypes/arachne.yml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml b/Resources/Prototypes/_DV/Entities/Body/Prototypes/vampiricanimal.yml similarity index 100% rename from Resources/Prototypes/Nyanotrasen/Entities/Body/Prototypes/vampiricanimal.yml rename to Resources/Prototypes/_DV/Entities/Body/Prototypes/vampiricanimal.yml diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Webbing/webs.yml b/Resources/Prototypes/_DV/Entities/Structures/Webbing/webs.yml similarity index 100% rename from Resources/Prototypes/Nyanotrasen/Entities/Structures/Webbing/webs.yml rename to Resources/Prototypes/_DV/Entities/Structures/Webbing/webs.yml diff --git a/Resources/Textures/_EE/Mobs/Species/arachne.rsi/meta.json b/Resources/Textures/_DV/Mobs/Species/arachne.rsi/meta.json similarity index 100% rename from Resources/Textures/_EE/Mobs/Species/arachne.rsi/meta.json rename to Resources/Textures/_DV/Mobs/Species/arachne.rsi/meta.json diff --git a/Resources/Textures/_EE/Mobs/Species/arachne.rsi/spider_body.png b/Resources/Textures/_DV/Mobs/Species/arachne.rsi/spider_body.png similarity index 100% rename from Resources/Textures/_EE/Mobs/Species/arachne.rsi/spider_body.png rename to Resources/Textures/_DV/Mobs/Species/arachne.rsi/spider_body.png diff --git a/Resources/Textures/_EE/Mobs/Species/arachne.rsi/spider_body_front.png b/Resources/Textures/_DV/Mobs/Species/arachne.rsi/spider_body_front.png similarity index 100% rename from Resources/Textures/_EE/Mobs/Species/arachne.rsi/spider_body_front.png rename to Resources/Textures/_DV/Mobs/Species/arachne.rsi/spider_body_front.png diff --git a/Resources/Textures/_EE/Mobs/Species/eyes.rsi/eyes.png b/Resources/Textures/_DV/Mobs/Species/eyes.rsi/eyes.png similarity index 100% rename from Resources/Textures/_EE/Mobs/Species/eyes.rsi/eyes.png rename to Resources/Textures/_DV/Mobs/Species/eyes.rsi/eyes.png diff --git a/Resources/Textures/_EE/Mobs/Species/eyes.rsi/meta.json b/Resources/Textures/_DV/Mobs/Species/eyes.rsi/meta.json similarity index 100% rename from Resources/Textures/_EE/Mobs/Species/eyes.rsi/meta.json rename to Resources/Textures/_DV/Mobs/Species/eyes.rsi/meta.json diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon1.png b/Resources/Textures/_DV/Structures/cocoon.rsi/cocoon1.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon1.png rename to Resources/Textures/_DV/Structures/cocoon.rsi/cocoon1.png diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon2.png b/Resources/Textures/_DV/Structures/cocoon.rsi/cocoon2.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon2.png rename to Resources/Textures/_DV/Structures/cocoon.rsi/cocoon2.png diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon3.png b/Resources/Textures/_DV/Structures/cocoon.rsi/cocoon3.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon3.png rename to Resources/Textures/_DV/Structures/cocoon.rsi/cocoon3.png diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large1.png b/Resources/Textures/_DV/Structures/cocoon.rsi/cocoon_large1.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large1.png rename to Resources/Textures/_DV/Structures/cocoon.rsi/cocoon_large1.png diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large2.png b/Resources/Textures/_DV/Structures/cocoon.rsi/cocoon_large2.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large2.png rename to Resources/Textures/_DV/Structures/cocoon.rsi/cocoon_large2.png diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large3.png b/Resources/Textures/_DV/Structures/cocoon.rsi/cocoon_large3.png similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/cocoon_large3.png rename to Resources/Textures/_DV/Structures/cocoon.rsi/cocoon_large3.png diff --git a/Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/meta.json b/Resources/Textures/_DV/Structures/cocoon.rsi/meta.json similarity index 100% rename from Resources/Textures/Nyanotrasen/Structures/cocoon.rsi/meta.json rename to Resources/Textures/_DV/Structures/cocoon.rsi/meta.json