diff --git a/Content.Client/_DV/Salvage/UI/MiningVoucherBoundUserInterface.cs b/Content.Client/DeltaV/Salvage/UI/MiningVoucherBoundUserInterface.cs similarity index 87% rename from Content.Client/_DV/Salvage/UI/MiningVoucherBoundUserInterface.cs rename to Content.Client/DeltaV/Salvage/UI/MiningVoucherBoundUserInterface.cs index 5ac6423f879..342e9073760 100644 --- a/Content.Client/_DV/Salvage/UI/MiningVoucherBoundUserInterface.cs +++ b/Content.Client/DeltaV/Salvage/UI/MiningVoucherBoundUserInterface.cs @@ -1,7 +1,7 @@ -using Content.Shared._DV.Salvage; +using Content.Shared.DeltaV.Salvage; using Robust.Client.UserInterface; -namespace Content.Client._DV.Salvage.UI; +namespace Content.Client.DeltaV.Salvage.UI; public sealed class MiningVoucherBoundUserInterface : BoundUserInterface { diff --git a/Content.Client/_DV/Salvage/UI/MiningVoucherMenu.xaml b/Content.Client/DeltaV/Salvage/UI/MiningVoucherMenu.xaml similarity index 100% rename from Content.Client/_DV/Salvage/UI/MiningVoucherMenu.xaml rename to Content.Client/DeltaV/Salvage/UI/MiningVoucherMenu.xaml diff --git a/Content.Client/_DV/Salvage/UI/MiningVoucherMenu.xaml.cs b/Content.Client/DeltaV/Salvage/UI/MiningVoucherMenu.xaml.cs similarity index 93% rename from Content.Client/_DV/Salvage/UI/MiningVoucherMenu.xaml.cs rename to Content.Client/DeltaV/Salvage/UI/MiningVoucherMenu.xaml.cs index ac37ec55450..823624317ad 100644 --- a/Content.Client/_DV/Salvage/UI/MiningVoucherMenu.xaml.cs +++ b/Content.Client/DeltaV/Salvage/UI/MiningVoucherMenu.xaml.cs @@ -1,14 +1,13 @@ using Content.Client.UserInterface.Controls; -using Content.Shared._DV.Salvage.Components; using Robust.Client.AutoGenerated; using Robust.Client.GameObjects; -using Robust.Client.UserInterface; using Robust.Client.UserInterface.Controls; using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; using System.Numerics; +using Content.Shared.DeltaV.Salvage.Components; -namespace Content.Client._DV.Salvage.UI; +namespace Content.Client.DeltaV.Salvage.UI; [GenerateTypedNameReferences] public sealed partial class MiningVoucherMenu : RadialMenu diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeBoundUserInterface.cs b/Content.Client/DeltaV/SmartFridge/SmartFridgeBoundUserInterface.cs similarity index 92% rename from Content.Client/_DV/SmartFridge/SmartFridgeBoundUserInterface.cs rename to Content.Client/DeltaV/SmartFridge/SmartFridgeBoundUserInterface.cs index 02b69c69186..e8180e20c8e 100644 --- a/Content.Client/_DV/SmartFridge/SmartFridgeBoundUserInterface.cs +++ b/Content.Client/DeltaV/SmartFridge/SmartFridgeBoundUserInterface.cs @@ -1,9 +1,9 @@ using Robust.Client.UserInterface; using Robust.Shared.Input; using Content.Client.UserInterface.Controls; -using Content.Shared._DV.SmartFridge; +using Content.Shared.DeltaV.SmartFridge; -namespace Content.Client._DV.SmartFridge; +namespace Content.Client.DeltaV.SmartFridge; public sealed class SmartFridgeBoundUserInterface : BoundUserInterface { diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeItem.xaml b/Content.Client/DeltaV/SmartFridge/SmartFridgeItem.xaml similarity index 100% rename from Content.Client/_DV/SmartFridge/SmartFridgeItem.xaml rename to Content.Client/DeltaV/SmartFridge/SmartFridgeItem.xaml diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeItem.xaml.cs b/Content.Client/DeltaV/SmartFridge/SmartFridgeItem.xaml.cs similarity index 90% rename from Content.Client/_DV/SmartFridge/SmartFridgeItem.xaml.cs rename to Content.Client/DeltaV/SmartFridge/SmartFridgeItem.xaml.cs index 020528d8137..6bb5a34ff5a 100644 --- a/Content.Client/_DV/SmartFridge/SmartFridgeItem.xaml.cs +++ b/Content.Client/DeltaV/SmartFridge/SmartFridgeItem.xaml.cs @@ -3,7 +3,7 @@ using Robust.Client.UserInterface.XAML; using Robust.Shared.Prototypes; -namespace Content.Client._DV.SmartFridge; +namespace Content.Client.DeltaV.SmartFridge; [GenerateTypedNameReferences] public sealed partial class SmartFridgeItem : BoxContainer diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeMenu.xaml b/Content.Client/DeltaV/SmartFridge/SmartFridgeMenu.xaml similarity index 100% rename from Content.Client/_DV/SmartFridge/SmartFridgeMenu.xaml rename to Content.Client/DeltaV/SmartFridge/SmartFridgeMenu.xaml diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeMenu.xaml.cs b/Content.Client/DeltaV/SmartFridge/SmartFridgeMenu.xaml.cs similarity index 96% rename from Content.Client/_DV/SmartFridge/SmartFridgeMenu.xaml.cs rename to Content.Client/DeltaV/SmartFridge/SmartFridgeMenu.xaml.cs index fb5f0353038..1364f8ee7c3 100644 --- a/Content.Client/_DV/SmartFridge/SmartFridgeMenu.xaml.cs +++ b/Content.Client/DeltaV/SmartFridge/SmartFridgeMenu.xaml.cs @@ -4,9 +4,9 @@ using Robust.Client.UserInterface.XAML; using Robust.Client.UserInterface; using Content.Client.UserInterface.Controls; -using Content.Shared._DV.SmartFridge; +using Content.Shared.DeltaV.SmartFridge; -namespace Content.Client._DV.SmartFridge; +namespace Content.Client.DeltaV.SmartFridge; public record SmartFridgeListData(EntityUid Representative, SmartFridgeEntry Entry, int Amount) : ListData; diff --git a/Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs b/Content.Client/DeltaV/SmartFridge/SmartFridgeUISystem.cs similarity index 88% rename from Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs rename to Content.Client/DeltaV/SmartFridge/SmartFridgeUISystem.cs index 32589dd5f7d..918f9c35d67 100644 --- a/Content.Client/_DV/SmartFridge/SmartFridgeUISystem.cs +++ b/Content.Client/DeltaV/SmartFridge/SmartFridgeUISystem.cs @@ -1,7 +1,7 @@ -using Content.Shared._DV.SmartFridge; +using Content.Shared.DeltaV.SmartFridge; using Robust.Shared.Analyzers; -namespace Content.Client._DV.SmartFridge; +namespace Content.Client.DeltaV.SmartFridge; public sealed class SmartFridgeUISystem : EntitySystem { diff --git a/Content.Client/Entry/EntryPoint.cs b/Content.Client/Entry/EntryPoint.cs index 0e04745635d..67015cff550 100644 --- a/Content.Client/Entry/EntryPoint.cs +++ b/Content.Client/Entry/EntryPoint.cs @@ -1,4 +1,3 @@ -using Content.Client._White.ItemSlotRenderer; using Content.Client.Administration.Managers; using Content.Client.Changelog; using Content.Client.Chat.Managers; @@ -24,6 +23,7 @@ using Content.Client.Stylesheets; using Content.Client.Viewport; using Content.Client.Voting; +using Content.Client.WhiteDream.ItemSlotRenderer; using Content.Shared.Ame.Components; using Content.Shared.Gravity; using Content.Shared.Localizations; @@ -158,7 +158,7 @@ public override void PostInit() _overlayManager.AddOverlay(new SingularityOverlay()); _overlayManager.AddOverlay(new RadiationPulseOverlay()); - _overlayManager.AddOverlay(new SpriteToLayerBullshitOverlay()); // WD EDIT + _overlayManager.AddOverlay(new SpriteToLayerBullshitOverlay()); _chatManager.Initialize(); _clientPreferencesManager.Initialize(); _euiManager.Initialize(); diff --git a/Content.Client/_White/ItemSlotRenderer/ItemSlotRendererComponent.cs b/Content.Client/WhiteDream/ItemSlotRenderer/ItemSlotRendererComponent.cs similarity index 80% rename from Content.Client/_White/ItemSlotRenderer/ItemSlotRendererComponent.cs rename to Content.Client/WhiteDream/ItemSlotRenderer/ItemSlotRendererComponent.cs index 185c0d19ec1..255bc77dc4d 100644 --- a/Content.Client/_White/ItemSlotRenderer/ItemSlotRendererComponent.cs +++ b/Content.Client/WhiteDream/ItemSlotRenderer/ItemSlotRendererComponent.cs @@ -1,12 +1,6 @@ -using Robust.Client.GameObjects; using Robust.Client.Graphics; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -namespace Content.Client._White.ItemSlotRenderer; +namespace Content.Client.WhiteDream.ItemSlotRenderer; [RegisterComponent] public sealed partial class ItemSlotRendererComponent : Component diff --git a/Content.Client/_White/ItemSlotRenderer/ItemSlotRendererSystem.cs b/Content.Client/WhiteDream/ItemSlotRenderer/ItemSlotRendererSystem.cs similarity index 95% rename from Content.Client/_White/ItemSlotRenderer/ItemSlotRendererSystem.cs rename to Content.Client/WhiteDream/ItemSlotRenderer/ItemSlotRendererSystem.cs index d1e1f9de70e..eded65ed30d 100644 --- a/Content.Client/_White/ItemSlotRenderer/ItemSlotRendererSystem.cs +++ b/Content.Client/WhiteDream/ItemSlotRenderer/ItemSlotRendererSystem.cs @@ -1,23 +1,14 @@ -using Content.Client.Hands; using Content.Shared.Containers.ItemSlots; using Robust.Client.GameObjects; using Robust.Client.Graphics; -using Robust.Client.Input; using Robust.Shared.Containers; using Robust.Shared.Enums; using Robust.Shared.Graphics; -using Robust.Shared.Map; -using Robust.Shared.Player; using Robust.Shared.Reflection; using Robust.Shared.Timing; -using System; -using System.Collections.Generic; -using System.Linq; using System.Numerics; -using System.Text; -using System.Threading.Tasks; -namespace Content.Client._White.ItemSlotRenderer; +namespace Content.Client.WhiteDream.ItemSlotRenderer; /// /// I can feel my grip on reality slowly slipping. diff --git a/Content.Goobstation.Client/Devil/UI/RevivalContractBoundUserInterface.cs b/Content.Goobstation.Client/Devil/UI/RevivalContractBoundUserInterface.cs deleted file mode 100644 index ee180a2126d..00000000000 --- a/Content.Goobstation.Client/Devil/UI/RevivalContractBoundUserInterface.cs +++ /dev/null @@ -1,52 +0,0 @@ -// SPDX-FileCopyrightText: 2025 GoobBot -// SPDX-FileCopyrightText: 2025 SolsticeOfTheWinter -// -// SPDX-License-Identifier: AGPL-3.0-or-later - -using Content.Goobstation.Shared.Devil.UI; -using JetBrains.Annotations; -using Robust.Client.UserInterface; - -namespace Content.Goobstation.Client.Devil.UI; - -[UsedImplicitly] -public sealed class RevivalContractBoundUserInterface : BoundUserInterface -{ - private RevivalContractMenu? _menu; - - public RevivalContractBoundUserInterface(EntityUid owner, Enum uiKey) : base(owner, uiKey) - { - IoCManager.InjectDependencies(this); - } - - protected override void Open() - { - base.Open(); - - _menu = this.CreateWindow(); - _menu.SetEntity(Owner); - _menu.Accepted += OnAccepted; - _menu.Rejected += OnRejected; - _menu.OnClose += OnClosed; - - _menu.OpenCentered(); - } - - private void OnAccepted() - { - SendPredictedMessage(new RevivalContractMessage(true)); - Close(); - } - - private void OnRejected() - { - SendPredictedMessage(new RevivalContractMessage(false)); - Close(); - } - - private void OnClosed() - { - SendPredictedMessage(new RevivalContractMessage(false)); - Close(); - } -} diff --git a/Content.Goobstation.Client/Devil/UI/RevivalContractMenu.xaml b/Content.Goobstation.Client/Devil/UI/RevivalContractMenu.xaml deleted file mode 100644 index 51d4c63879b..00000000000 --- a/Content.Goobstation.Client/Devil/UI/RevivalContractMenu.xaml +++ /dev/null @@ -1,17 +0,0 @@ - - - /// A vendor that sells mining equipment. Also holds a radial menu to redeem vouchers with a preset list of items. diff --git a/Content.Shared/DeltaV/Salvage/Components/MiningVoucherComponent.cs b/Content.Shared/DeltaV/Salvage/Components/MiningVoucherComponent.cs index ea9d4091634..a8774f14499 100644 --- a/Content.Shared/DeltaV/Salvage/Components/MiningVoucherComponent.cs +++ b/Content.Shared/DeltaV/Salvage/Components/MiningVoucherComponent.cs @@ -1,9 +1,9 @@ -using Content.Shared._DV.Salvage.Systems; +using Content.Shared.DeltaV.Salvage.Systems; using Content.Shared.Whitelist; using Robust.Shared.Audio; using Robust.Shared.GameStates; -namespace Content.Shared._DV.Salvage.Components; +namespace Content.Shared.DeltaV.Salvage.Components; /// /// Trigger for purchasing a kit from the Mining Vendors. diff --git a/Content.Shared/DeltaV/Salvage/MiningVoucherUI.cs b/Content.Shared/DeltaV/Salvage/MiningVoucherUI.cs index e01f19e8f20..a9591a12e13 100644 --- a/Content.Shared/DeltaV/Salvage/MiningVoucherUI.cs +++ b/Content.Shared/DeltaV/Salvage/MiningVoucherUI.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared._DV.Salvage; +namespace Content.Shared.DeltaV.Salvage; /// /// Message for a mining voucher kit to be selected. diff --git a/Content.Shared/DeltaV/Salvage/Systems/MiningVoucherSystem.cs b/Content.Shared/DeltaV/Salvage/Systems/MiningVoucherSystem.cs index 3fb2d8b8877..6d5be2bede4 100644 --- a/Content.Shared/DeltaV/Salvage/Systems/MiningVoucherSystem.cs +++ b/Content.Shared/DeltaV/Salvage/Systems/MiningVoucherSystem.cs @@ -1,4 +1,4 @@ -using Content.Shared._DV.Salvage.Components; +using Content.Shared.DeltaV.Salvage.Components; using Content.Shared.Hands.EntitySystems; using Content.Shared.Interaction; using Content.Shared.Popups; @@ -7,7 +7,7 @@ using Robust.Shared.Audio.Systems; using Robust.Shared.Network; using Robust.Shared.Prototypes; -namespace Content.Shared._DV.Salvage.Systems; +namespace Content.Shared.DeltaV.Salvage.Systems; public sealed class MiningVoucherSystem : EntitySystem { diff --git a/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs b/Content.Shared/DeltaV/SmartFridge/SmartFridgeComponent.cs similarity index 97% rename from Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs rename to Content.Shared/DeltaV/SmartFridge/SmartFridgeComponent.cs index eb4e92b6d9f..fb96e9fdfc8 100644 --- a/Content.Shared/_DV/SmartFridge/SmartFridgeComponent.cs +++ b/Content.Shared/DeltaV/SmartFridge/SmartFridgeComponent.cs @@ -6,7 +6,7 @@ using Robust.Shared.Prototypes; using Robust.Shared.Serialization; -namespace Content.Shared._DV.SmartFridge; +namespace Content.Shared.DeltaV.SmartFridge; [RegisterComponent, NetworkedComponent, AutoGenerateComponentState(true)] public sealed partial class SmartFridgeComponent : Component @@ -48,7 +48,7 @@ public sealed partial class SmartFridgeComponent : Component [DataField] public SoundSpecifier SoundDeny = new SoundPathSpecifier("/Audio/Machines/custom_deny.ogg"); - // Frontier: + // Frontier: /// /// The maximum number of entities that can be stored in the fridge /// diff --git a/Content.Shared/_DV/SmartFridge/SmartFridgeSystem.cs b/Content.Shared/DeltaV/SmartFridge/SmartFridgeSystem.cs similarity index 98% rename from Content.Shared/_DV/SmartFridge/SmartFridgeSystem.cs rename to Content.Shared/DeltaV/SmartFridge/SmartFridgeSystem.cs index a81eda06d74..f61af8e64e5 100644 --- a/Content.Shared/_DV/SmartFridge/SmartFridgeSystem.cs +++ b/Content.Shared/DeltaV/SmartFridge/SmartFridgeSystem.cs @@ -1,4 +1,3 @@ -using Content.Shared.Access.Components; using Content.Shared.Access.Systems; using Content.Shared.Hands.EntitySystems; using Content.Shared.IdentityManagement; @@ -7,10 +6,9 @@ using Content.Shared.Whitelist; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; -using Robust.Shared.GameObjects; using Robust.Shared.Timing; -namespace Content.Shared._DV.SmartFridge; +namespace Content.Shared.DeltaV.SmartFridge; public sealed class SmartFridgeSystem : EntitySystem { diff --git a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs index 804fbd50fa1..e6c847107e3 100644 --- a/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs +++ b/Content.Shared/Movement/Pulling/Systems/PullingSystem.cs @@ -1,7 +1,6 @@ using System.Diagnostics.CodeAnalysis; using Content.Shared._Goobstation.MartialArts.Components; using Content.Shared._Goobstation.MartialArts.Events; -using Content.Shared._White.Grab; using Content.Shared.ActionBlocker; using Content.Shared.Administration.Logs; using Content.Shared.Alert; @@ -35,6 +34,7 @@ using Content.Shared.Throwing; using Content.Shared.Verbs; using Content.Shared.Weapons.Melee; +using Content.Shared.WhiteDream.Grab; using Robust.Shared.Audio; using Robust.Shared.Audio.Systems; using Robust.Shared.Containers; diff --git a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs index 94d1f3f5771..81b81a91d6f 100644 --- a/Content.Shared/Storage/EntitySystems/DumpableSystem.cs +++ b/Content.Shared/Storage/EntitySystems/DumpableSystem.cs @@ -1,5 +1,5 @@ using System.Linq; -using Content.Shared._DV.SmartFridge; // DeltaV - ough why do you not use events for this +using Content.Shared.DeltaV.SmartFridge; using Content.Shared.Disposal; using Content.Shared.DoAfter; using Content.Shared.Interaction; @@ -23,8 +23,8 @@ public sealed class DumpableSystem : EntitySystem [Dependency] private readonly SharedDisposalUnitSystem _disposalUnitSystem = default!; [Dependency] private readonly SharedDoAfterSystem _doAfterSystem = default!; [Dependency] private readonly SharedTransformSystem _transformSystem = default!; - [Dependency] private readonly SharedContainerSystem _container = default!; // DeltaV - ough why do you not use events for this - [Dependency] private readonly SmartFridgeSystem _smartFridge = default!; // Frontier + [Dependency] private readonly SharedContainerSystem _container = default!; + [Dependency] private readonly SmartFridgeSystem _smartFridge = default!; private EntityQuery _itemQuery; diff --git a/Content.Shared/_White/Grab/GrabThrownComponent.cs b/Content.Shared/WhiteDream/Grab/GrabThrownComponent.cs similarity index 86% rename from Content.Shared/_White/Grab/GrabThrownComponent.cs rename to Content.Shared/WhiteDream/Grab/GrabThrownComponent.cs index d9e3ff5bb00..0b434a1e0e0 100644 --- a/Content.Shared/_White/Grab/GrabThrownComponent.cs +++ b/Content.Shared/WhiteDream/Grab/GrabThrownComponent.cs @@ -1,7 +1,7 @@ using Robust.Shared.GameStates; using Content.Shared.Damage; -namespace Content.Shared._White.Grab; +namespace Content.Shared.WhiteDream.Grab; [RegisterComponent, NetworkedComponent] public sealed partial class GrabThrownComponent : Component diff --git a/Content.Shared/_White/Grab/GrabThrownSystem.cs b/Content.Shared/WhiteDream/Grab/GrabThrownSystem.cs similarity index 98% rename from Content.Shared/_White/Grab/GrabThrownSystem.cs rename to Content.Shared/WhiteDream/Grab/GrabThrownSystem.cs index a4a6bc4a1ec..a32f03c604f 100644 --- a/Content.Shared/_White/Grab/GrabThrownSystem.cs +++ b/Content.Shared/WhiteDream/Grab/GrabThrownSystem.cs @@ -6,11 +6,10 @@ using Robust.Shared.Physics.Events; using Robust.Shared.Player; using System.Numerics; -using Content.Shared._White; using Content.Shared.Standing; using Robust.Shared.Physics.Components; -namespace Content.Shared._White.Grab; +namespace Content.Shared.WhiteDream.Grab; public sealed class GrabThrownSystem : EntitySystem { diff --git a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs index d3991915780..2d7893c8aab 100644 --- a/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs +++ b/Content.Shared/_Goobstation/MartialArts/SharedMartialArtsSystem.cs @@ -1,6 +1,5 @@ using Content.Shared._Goobstation.MartialArts.Components; using Content.Shared._Shitmed.Targeting; -using Content.Shared._White.Grab; using Content.Shared.Actions; using Content.Shared.Damage; using Content.Shared.Damage.Components; @@ -19,6 +18,7 @@ using Content.Shared.Weapons.Melee; using Content.Shared.Weapons.Melee.Events; using Content.Shared.Weapons.Ranged.Events; +using Content.Shared.WhiteDream.Grab; using Robust.Shared.Audio.Systems; using Robust.Shared.Network; using Robust.Shared.Prototypes; @@ -203,7 +203,7 @@ private bool TryGrant(GrantMartialArtKnowledgeComponent comp, EntityUid user) var pullerComponent = EnsureComp(user); if (!_proto.TryIndex(comp.MartialArtsForm.ToString(), out var martialArtsPrototype)) return false; - + martialArtsKnowledgeComponent.MartialArtsForm = martialArtsPrototype.MartialArtsForm; LoadCombos(martialArtsPrototype.RoundstartCombos, canPerformComboComponent); martialArtsKnowledgeComponent.Blocked = false; diff --git a/Content.Shared/_Imp/Drone/SharedDroneSystem.cs b/Content.Shared/_Impstation/Drone/SharedDroneSystem.cs similarity index 89% rename from Content.Shared/_Imp/Drone/SharedDroneSystem.cs rename to Content.Shared/_Impstation/Drone/SharedDroneSystem.cs index 59d16c2bb60..ee6ddcb4d75 100644 --- a/Content.Shared/_Imp/Drone/SharedDroneSystem.cs +++ b/Content.Shared/_Impstation/Drone/SharedDroneSystem.cs @@ -1,6 +1,6 @@ using Robust.Shared.Serialization; -namespace Content.Shared._Imp.Drone; +namespace Content.Shared._Impstation.Drone; public abstract class SharedDroneSystem : EntitySystem { diff --git a/Resources/Locale/en-US/_DV/smartfridge/smartfridge.ftl b/Resources/Locale/en-US/DeltaV/smartfridge/smartfridge.ftl similarity index 100% rename from Resources/Locale/en-US/_DV/smartfridge/smartfridge.ftl rename to Resources/Locale/en-US/DeltaV/smartfridge/smartfridge.ftl diff --git a/Resources/Locale/en-US/_EE/store/uplink-catalog.ftl b/Resources/Locale/en-US/_EE/store/uplink-catalog.ftl index c52e69ea68c..ae10efa1708 100644 --- a/Resources/Locale/en-US/_EE/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_EE/store/uplink-catalog.ftl @@ -9,3 +9,11 @@ uplink-faction-san-asset-group-name = Sol Alliance Asset Bundle (Team) uplink-faction-san-asset-group-desc = Contains five uniforms for a team of operatives working for the Solarian Alliance, includes five CSA-85x Modsuits ((For use in re-flavoring your antag activity as having a different employer than the Syndicate)) + +# Bloodred Modsuit +uplink-modsuit-bloodred-name = EE-99MS "Raider" Modsuit +uplink-modsuit-bloodred-desc = A mass production model of a modular-tacsuit that once made headlines for its showings in Solarian media. After being rejected in favor of the Shanlin tacsuit, these suits have mysteriously become commonplace among frontier pirate crews. + +# Elite Modsuit +uplink-modsuit-elitemodsuit-name = EE-122MS "Jaeger" Modsuit +uplink-modsuit-elitemodsuit-desc = A mass production modular take on the Shiwei tacsuit. It trades a lot of the Shiwei's enhanced protection for modular equipment gear. Compared with the Jaeger modsuit, it offers unparalleled protection from energy weapons, but its ballistic protection leaves much to be desired. diff --git a/Resources/Locale/en-US/_Imp/Drone/drone-system.ftl b/Resources/Locale/en-US/_Impstation/Drone/drone-system.ftl similarity index 100% rename from Resources/Locale/en-US/_Imp/Drone/drone-system.ftl rename to Resources/Locale/en-US/_Impstation/Drone/drone-system.ftl diff --git a/Resources/Locale/en-US/_Imp/Drone/ghost-role-component.ftl b/Resources/Locale/en-US/_Impstation/Drone/ghost-role-component.ftl similarity index 100% rename from Resources/Locale/en-US/_Imp/Drone/ghost-role-component.ftl rename to Resources/Locale/en-US/_Impstation/Drone/ghost-role-component.ftl diff --git a/Resources/Locale/en-US/_TG/store/uplink-catalog.ftl b/Resources/Locale/en-US/_TG/store/uplink-catalog.ftl deleted file mode 100644 index 0d511930fc6..00000000000 --- a/Resources/Locale/en-US/_TG/store/uplink-catalog.ftl +++ /dev/null @@ -1,7 +0,0 @@ -# Bloodred Modsuit -uplink-modsuit-bloodred-name = EE-99MS "Raider" Modsuit -uplink-modsuit-bloodred-desc = A mass production model of a modular-tacsuit that once made headlines for its showings in Solarian media. After being rejected in favor of the Shanlin tacsuit, these suits have mysteriously become commonplace among frontier pirate crews. - -# Elite Modsuit -uplink-modsuit-elitemodsuit-name = EE-122MS "Jaeger" Modsuit -uplink-modsuit-elitemodsuit-desc = A mass production modular take on the Shiwei tacsuit. It trades a lot of the Shiwei's enhanced protection for modular equipment gear. Compared with the Jaeger modsuit, it offers unparalleled protection from energy weapons, but its ballistic protection leaves much to be desired. diff --git a/Resources/Locale/en-US/_white/grab/grab.ftl b/Resources/Locale/en-US/white-dream/grab/grab.ftl similarity index 100% rename from Resources/Locale/en-US/_white/grab/grab.ftl rename to Resources/Locale/en-US/white-dream/grab/grab.ftl diff --git a/Resources/Locale/en-US/_white/rechargable-blocking/rechargeable-blocking.ftl b/Resources/Locale/en-US/white-dream/rechargable-blocking/rechargeable-blocking.ftl similarity index 100% rename from Resources/Locale/en-US/_white/rechargable-blocking/rechargeable-blocking.ftl rename to Resources/Locale/en-US/white-dream/rechargable-blocking/rechargeable-blocking.ftl diff --git a/Resources/Prototypes/Alerts/alerts.yml b/Resources/Prototypes/Alerts/alerts.yml index a9ff321b3d1..8faa6f8bbb3 100644 --- a/Resources/Prototypes/Alerts/alerts.yml +++ b/Resources/Prototypes/Alerts/alerts.yml @@ -433,13 +433,13 @@ - type: alert id: Pulling icons: - - sprite: /Textures/_White/Interface/Alerts/pull.rsi + - sprite: /Textures/WhiteDream/Interface/Alerts/pull.rsi state: pulling - - sprite: /Textures/_White/Interface/Alerts/pull.rsi + - sprite: /Textures/WhiteDream/Interface/Alerts/pull.rsi state: grab-soft - - sprite: /Textures/_White/Interface/Alerts/pull.rsi + - sprite: /Textures/WhiteDream/Interface/Alerts/pull.rsi state: grab-hard - - sprite: /Textures/_White/Interface/Alerts/pull.rsi + - sprite: /Textures/WhiteDream/Interface/Alerts/pull.rsi state: grab-choke clickEvent: !type:StopPullingAlertEvent name: alerts-pulling-name diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml index 4a55ff585e9..0fd16a9ddb6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/thaven.yml @@ -5,7 +5,7 @@ markingCategory: HeadTop speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi + - sprite: DeltaV/Mobs/Customization/thaven.rsi state: cheek_barbels - type: marking @@ -14,7 +14,7 @@ markingCategory: HeadTop speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi + - sprite: DeltaV/Mobs/Customization/thaven.rsi state: eyebrow_barbels - type: marking @@ -23,7 +23,7 @@ markingCategory: HeadTop speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi + - sprite: DeltaV/Mobs/Customization/thaven.rsi state: underbelly_face # Torso @@ -33,7 +33,7 @@ markingCategory: Chest speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi + - sprite: DeltaV/Mobs/Customization/thaven.rsi state: underbelly_torso - type: marking @@ -42,5 +42,5 @@ markingCategory: Chest speciesRestriction: [Thaven] sprites: - - sprite: _DV/Mobs/Customization/thaven.rsi + - sprite: DeltaV/Mobs/Customization/thaven.rsi state: carp_spots diff --git a/Resources/Prototypes/DeltaV/GameRules/events.yml b/Resources/Prototypes/DeltaV/GameRules/events.yml index 2997ceb0734..7183a3d4956 100644 --- a/Resources/Prototypes/DeltaV/GameRules/events.yml +++ b/Resources/Prototypes/DeltaV/GameRules/events.yml @@ -83,3 +83,13 @@ duration: 1 - type: PirateRadioSpawnRule debrisCount: 6 + +- type: entity + parent: BaseGlimmerEvent + id: ThavenMoodUpset + components: + - type: GlimmerEvent + minimumGlimmer: 500 + glimmerBurnLower: 30 + glimmerBurnUpper: 70 + - type: ThavenMoodUpsetRule diff --git a/Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ipc_wings.yml similarity index 68% rename from Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml rename to Resources/Prototypes/Entities/Mobs/Customization/Markings/ipc_wings.yml index 16360d63047..07b8cc31cb0 100644 --- a/Resources/Prototypes/_SimpleStation/Entities/Mobs/Customization/IPCwings.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/ipc_wings.yml @@ -4,5 +4,5 @@ markingCategory: Wings speciesRestriction: [IPC] sprites: - - sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi + - sprite: Mobs/Customization/wings64x34.rsi state: robotic diff --git a/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml b/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml index a66528a75a4..18f6f63c5fa 100644 --- a/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml +++ b/Resources/Prototypes/Entities/Mobs/Customization/Markings/plasmaman_wings.yml @@ -4,5 +4,5 @@ markingCategory: Wings speciesRestriction: [Plasmaman] sprites: - - sprite: _SimpleStation/Mobs/Customization/wings64x34.rsi + - sprite: Mobs/Customization/wings64x34.rsi state: skeleton diff --git a/Resources/Prototypes/_CS4875/Clothing/Uniforms.yml b/Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpskirt.yml similarity index 100% rename from Resources/Prototypes/_CS4875/Clothing/Uniforms.yml rename to Resources/Prototypes/Nyanotrasen/Entities/Clothing/Uniforms/jumpskirt.yml diff --git a/Resources/Prototypes/Recipes/Crafting/bots.yml b/Resources/Prototypes/Recipes/Crafting/bots.yml index 6b467a2f811..e6217a2faf1 100644 --- a/Resources/Prototypes/Recipes/Crafting/bots.yml +++ b/Resources/Prototypes/Recipes/Crafting/bots.yml @@ -190,5 +190,5 @@ objectType: Item description: This bot is an extremely advanced AI controlled engineer. icon: - sprite: _Imp/Drone/drone.rsi + sprite: _Impstation/Drone/drone.rsi state: shell diff --git a/Resources/Prototypes/_White/Shaders/shaders.yml b/Resources/Prototypes/WhiteDream/Shaders/shaders.yml similarity index 72% rename from Resources/Prototypes/_White/Shaders/shaders.yml rename to Resources/Prototypes/WhiteDream/Shaders/shaders.yml index 5acb19ff175..57c131d5fc6 100644 --- a/Resources/Prototypes/_White/Shaders/shaders.yml +++ b/Resources/Prototypes/WhiteDream/Shaders/shaders.yml @@ -1,7 +1,7 @@ - type: shader id: FlickerHologram kind: source - path: "/Textures/_White/Shaders/flickerhologram.swsl" + path: "/Textures/WhiteDream/Shaders/flickerhologram.swsl" light_mode: unshaded params: jitter: 0.5 @@ -12,7 +12,7 @@ - type: shader id: FlickerHologramGlitch kind: source - path: "/Textures/_White/Shaders/flickerhologram.swsl" + path: "/Textures/WhiteDream/Shaders/flickerhologram.swsl" light_mode: unshaded params: jitter: 5 diff --git a/Resources/Prototypes/_DV/GameRules/events.yml b/Resources/Prototypes/_DV/GameRules/events.yml deleted file mode 100644 index 789d29895ec..00000000000 --- a/Resources/Prototypes/_DV/GameRules/events.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: entity - parent: BaseGlimmerEvent - id: ThavenMoodUpset - components: - - type: GlimmerEvent - minimumGlimmer: 500 - glimmerBurnLower: 30 - glimmerBurnUpper: 70 - - type: ThavenMoodUpsetRule diff --git a/Resources/Prototypes/_EE/Catalog/uplink_catalog.yml b/Resources/Prototypes/_EE/Catalog/uplink_catalog.yml index 40f8bd934d7..3ac4aae626f 100644 --- a/Resources/Prototypes/_EE/Catalog/uplink_catalog.yml +++ b/Resources/Prototypes/_EE/Catalog/uplink_catalog.yml @@ -3,6 +3,36 @@ name: store-category-faction priority: 12 +# Wearables + +- type: listing + id: UplinkHardsuitBloodRedModsuit + name: uplink-modsuit-bloodred-name + description: uplink-modsuit-bloodred-desc + icon: { sprite: /Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi, state: chestplate } + productEntity: BloodredModsuitBackpack + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 15 + cost: + Telecrystal: 25 + categories: + - UplinkWearables + +- type: listing + id: UplinkHardsuitSyndicateEliteModsuit + name: uplink-modsuit-elitemodsuit-name + description: uplink-modsuit-elitemodsuit-desc + icon: { sprite: /Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi, state: chestplate } + productEntity: EliteModsuitBackpack + discountCategory: rareDiscounts + discountDownTo: + Telecrystal: 35 + cost: + Telecrystal: 70 + categories: + - UplinkWearables + # Faction Gear Loadouts # Solarian Alliance - type: listing diff --git a/Resources/Prototypes/_TG/Entities/Clothing/Modsuits/SyndicateModsuits.yml b/Resources/Prototypes/_EE/Entities/Clothing/Modsuits/SyndicateModsuits.yml similarity index 93% rename from Resources/Prototypes/_TG/Entities/Clothing/Modsuits/SyndicateModsuits.yml rename to Resources/Prototypes/_EE/Entities/Clothing/Modsuits/SyndicateModsuits.yml index 2159212aa9e..42d33e898e2 100644 --- a/Resources/Prototypes/_TG/Entities/Clothing/Modsuits/SyndicateModsuits.yml +++ b/Resources/Prototypes/_EE/Entities/Clothing/Modsuits/SyndicateModsuits.yml @@ -6,7 +6,7 @@ description: A control module for the "Raider" modsuit. components: - type: Sprite - sprite: _TG/Clothing/Modsuit/bloodredmodsuit.rsi + sprite: _EE/Clothing/Modsuit/bloodredmodsuit.rsi - type: ExplosionResistance damageCoefficient: 0.6 - type: ToggleableClothing @@ -42,7 +42,7 @@ categories: [HideSpawnMenu] components: - type: Sprite - sprite: _TG/Clothing/Modsuit/bloodredmodsuit.rsi + sprite: _EE/Clothing/Modsuit/bloodredmodsuit.rsi - type: SealableClothingVisuals visualLayers: gloves: @@ -56,7 +56,7 @@ categories: [HideSpawnMenu] components: - type: Sprite - sprite: _TG/Clothing/Modsuit/bloodredmodsuit.rsi + sprite: _EE/Clothing/Modsuit/bloodredmodsuit.rsi - type: Armor modifiers: coefficients: @@ -84,7 +84,7 @@ categories: [HideSpawnMenu] components: - type: Sprite - sprite: _TG/Clothing/Modsuit/bloodredmodsuit.rsi + sprite: _EE/Clothing/Modsuit/bloodredmodsuit.rsi - type: ClothingSpeedModifier walkModifier: 0.9 sprintModifier: 0.9 @@ -130,7 +130,7 @@ components: - type: Appearance - type: Sprite - sprite: _TG/Clothing/Modsuit/bloodredmodsuit.rsi + sprite: _EE/Clothing/Modsuit/bloodredmodsuit.rsi - type: Tag tags: - WhitelistChameleon @@ -150,7 +150,7 @@ description: A controller for the "Jaeger" modsuit. components: - type: Sprite - sprite: _TG/Clothing/Modsuit/syndicateelitemodsuit.rsi + sprite: _EE/Clothing/Modsuit/syndicateelitemodsuit.rsi - type: ExplosionResistance damageCoefficient: 0.6 - type: ToggleableClothing @@ -186,7 +186,7 @@ categories: [HideSpawnMenu] components: - type: Sprite - sprite: _TG/Clothing/Modsuit/syndicateelitemodsuit.rsi + sprite: _EE/Clothing/Modsuit/syndicateelitemodsuit.rsi - type: SealableClothingVisuals visualLayers: gloves: @@ -201,7 +201,7 @@ categories: [HideSpawnMenu] components: - type: Sprite - sprite: _TG/Clothing/Modsuit/syndicateelitemodsuit.rsi + sprite: _EE/Clothing/Modsuit/syndicateelitemodsuit.rsi - type: Armor modifiers: coefficients: @@ -230,7 +230,7 @@ categories: [HideSpawnMenu] components: - type: Sprite - sprite: _TG/Clothing/Modsuit/syndicateelitemodsuit.rsi + sprite: _EE/Clothing/Modsuit/syndicateelitemodsuit.rsi - type: Armor modifiers: flatReductions: @@ -274,7 +274,7 @@ components: - type: Appearance - type: Sprite - sprite: _TG/Clothing/Modsuit/syndicateelitemodsuit.rsi + sprite: _EE/Clothing/Modsuit/syndicateelitemodsuit.rsi - type: Tag tags: - WhitelistChameleon diff --git a/Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml b/Resources/Prototypes/_Impstation/Drone/Mobs_Player_silicon.yml similarity index 98% rename from Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml rename to Resources/Prototypes/_Impstation/Drone/Mobs_Player_silicon.yml index adfaa743374..270bfbe21c5 100644 --- a/Resources/Prototypes/_Imp/_Drone/Mobs_Player_silicon.yml +++ b/Resources/Prototypes/_Impstation/Drone/Mobs_Player_silicon.yml @@ -167,11 +167,11 @@ drawdepth: SmallMobs layers: - state: shell - sprite: _Imp/Drone/drone.rsi #Mobs/Silicon/drone.rsi + sprite: _Impstation/Drone/drone.rsi #Mobs/Silicon/drone.rsi map: ["base"] - type: BorgTransponder sprite: - sprite: _Imp/Drone/drone.rsi + sprite: _Impstation/Drone/drone.rsi state: shell name: drone - type: MovementIgnoreGravity diff --git a/Resources/Prototypes/_Imp/_Drone/drone.yml b/Resources/Prototypes/_Impstation/Drone/drone.yml similarity index 100% rename from Resources/Prototypes/_Imp/_Drone/drone.yml rename to Resources/Prototypes/_Impstation/Drone/drone.yml diff --git a/Resources/Prototypes/_Imp/_Drone/drone_inventory_template.yml b/Resources/Prototypes/_Impstation/Drone/drone_inventory_template.yml similarity index 100% rename from Resources/Prototypes/_Imp/_Drone/drone_inventory_template.yml rename to Resources/Prototypes/_Impstation/Drone/drone_inventory_template.yml diff --git a/Resources/Prototypes/_Imp/_Drone/drone_tools.yml b/Resources/Prototypes/_Impstation/Drone/drone_tools.yml similarity index 97% rename from Resources/Prototypes/_Imp/_Drone/drone_tools.yml rename to Resources/Prototypes/_Impstation/Drone/drone_tools.yml index ae74393dc53..1c2fb23cb02 100644 --- a/Resources/Prototypes/_Imp/_Drone/drone_tools.yml +++ b/Resources/Prototypes/_Impstation/Drone/drone_tools.yml @@ -8,7 +8,7 @@ components: - type: Unremoveable - type: Sprite - sprite: _Imp/Drone/dronesatchel.rsi + sprite: _Impstation/Drone/dronesatchel.rsi - type: entity parent: trayScanner diff --git a/Resources/Prototypes/_Imp/_Drone/satchel.yml b/Resources/Prototypes/_Impstation/Drone/satchel.yml similarity index 100% rename from Resources/Prototypes/_Imp/_Drone/satchel.yml rename to Resources/Prototypes/_Impstation/Drone/satchel.yml diff --git a/Resources/Prototypes/_Imp/name_identifier_groups.yml b/Resources/Prototypes/_Impstation/name_identifier_groups.yml similarity index 100% rename from Resources/Prototypes/_Imp/name_identifier_groups.yml rename to Resources/Prototypes/_Impstation/name_identifier_groups.yml diff --git a/Resources/Prototypes/_Imp/Tags.yml b/Resources/Prototypes/_Impstation/tags.yml similarity index 100% rename from Resources/Prototypes/_Imp/Tags.yml rename to Resources/Prototypes/_Impstation/tags.yml diff --git a/Resources/Prototypes/_TG/uplink_catalog.yml b/Resources/Prototypes/_TG/uplink_catalog.yml deleted file mode 100644 index b1169def210..00000000000 --- a/Resources/Prototypes/_TG/uplink_catalog.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Wearables - -- type: listing - id: UplinkHardsuitBloodRedModsuit - name: uplink-modsuit-bloodred-name - description: uplink-modsuit-bloodred-desc - icon: { sprite: /Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi, state: chestplate } - productEntity: BloodredModsuitBackpack - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 15 - cost: - Telecrystal: 25 - categories: - - UplinkWearables - -- type: listing - id: UplinkHardsuitSyndicateEliteModsuit - name: uplink-modsuit-elitemodsuit-name - description: uplink-modsuit-elitemodsuit-desc - icon: { sprite: /Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi, state: chestplate } - productEntity: EliteModsuitBackpack - discountCategory: rareDiscounts - discountDownTo: - Telecrystal: 35 - cost: - Telecrystal: 70 - categories: - - UplinkWearables \ No newline at end of file diff --git a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-HELMET-vulpkanin.png b/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-HELMET-vulpkanin.png deleted file mode 100644 index aa48516b907..00000000000 Binary files a/Resources/Textures/Clothing/Head/Hardsuits/paramedhelm.rsi/equipped-HELMET-vulpkanin.png and /dev/null differ diff --git a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-vox.png b/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-vox.png deleted file mode 100644 index b4f8cacea5b..00000000000 Binary files a/Resources/Textures/Clothing/OuterClothing/WinterCoats/coatwarden.rsi/equipped-OUTERCLOTHING-vox.png and /dev/null differ diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png b/Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/carp_spots.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/thaven.rsi/carp_spots.png rename to Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/carp_spots.png diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png b/Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/cheek_barbels.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/thaven.rsi/cheek_barbels.png rename to Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/cheek_barbels.png diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png b/Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png rename to Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/eyebrow_barbels.png diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json b/Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/meta.json similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/thaven.rsi/meta.json rename to Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/meta.json diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png b/Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/underbelly_face.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_face.png rename to Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/underbelly_face.png diff --git a/Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png b/Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/underbelly_torso.png similarity index 100% rename from Resources/Textures/_DV/Mobs/Customization/thaven.rsi/underbelly_torso.png rename to Resources/Textures/DeltaV/Mobs/Customization/thaven.rsi/underbelly_torso.png diff --git a/Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/dragon.png b/Resources/Textures/Mobs/Customization/wings64x34.rsi/dragon.png similarity index 100% rename from Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/dragon.png rename to Resources/Textures/Mobs/Customization/wings64x34.rsi/dragon.png diff --git a/Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/fly.png b/Resources/Textures/Mobs/Customization/wings64x34.rsi/fly.png similarity index 100% rename from Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/fly.png rename to Resources/Textures/Mobs/Customization/wings64x34.rsi/fly.png diff --git a/Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/meta.json b/Resources/Textures/Mobs/Customization/wings64x34.rsi/meta.json similarity index 100% rename from Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/meta.json rename to Resources/Textures/Mobs/Customization/wings64x34.rsi/meta.json diff --git a/Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/robotic.png b/Resources/Textures/Mobs/Customization/wings64x34.rsi/robotic.png similarity index 100% rename from Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/robotic.png rename to Resources/Textures/Mobs/Customization/wings64x34.rsi/robotic.png diff --git a/Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/skeleton.png b/Resources/Textures/Mobs/Customization/wings64x34.rsi/skeleton.png similarity index 100% rename from Resources/Textures/_SimpleStation/Mobs/Customization/wings64x34.rsi/skeleton.png rename to Resources/Textures/Mobs/Customization/wings64x34.rsi/skeleton.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/grab-choke.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grab-choke.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/grab-choke.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grab-choke.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/grab-hard.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grab-hard.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/grab-hard.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grab-hard.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/grab-soft.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grab-soft.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/grab-soft.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grab-soft.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/grabbed-choke.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grabbed-choke.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/grabbed-choke.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grabbed-choke.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/grabbed-hard.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grabbed-hard.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/grabbed-hard.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grabbed-hard.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/grabbed-soft.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grabbed-soft.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/grabbed-soft.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/grabbed-soft.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/meta.json b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/meta.json similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/meta.json rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/meta.json diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/pulled.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/pulled.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/pulled.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/pulled.png diff --git a/Resources/Textures/_White/Interface/Alerts/pull.rsi/pulling.png b/Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/pulling.png similarity index 100% rename from Resources/Textures/_White/Interface/Alerts/pull.rsi/pulling.png rename to Resources/Textures/WhiteDream/Interface/Alerts/pull.rsi/pulling.png diff --git a/Resources/Textures/_White/Shaders/flickerhologram.swsl b/Resources/Textures/WhiteDream/Shaders/flickerhologram.swsl similarity index 100% rename from Resources/Textures/_White/Shaders/flickerhologram.swsl rename to Resources/Textures/WhiteDream/Shaders/flickerhologram.swsl diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/boots-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/boots-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/boots-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/boots-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/boots.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/boots.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/boots.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/boots.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/chestplate.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/control-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/control-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/control-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/control-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/control.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/control.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/control.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/control.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed_glow.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed_glow.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed_glow.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK-sealed_glow.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-FEET.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HAND.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed_glow.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed_glow.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed_glow.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD-sealed_glow.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-HEAD.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/gauntlets.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/helmet-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/helmet-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/helmet-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/helmet-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/helmet.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/helmet.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/helmet.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/helmet.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/icon-on.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/icon-on.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/icon-on.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/icon-on.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/icon.png b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/icon.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/icon.png rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/icon.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/meta.json b/Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/meta.json similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/bloodredmodsuit.rsi/meta.json rename to Resources/Textures/_EE/Clothing/Modsuit/bloodredmodsuit.rsi/meta.json diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/boots.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/chestplate.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/control-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/control-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/control-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/control-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/control.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/control.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/control.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/control.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed_glow.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed_glow.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed_glow.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK-sealed_glow.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-FEET.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HAND.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed_glow.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed_glow.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed_glow.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD-sealed_glow.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-HEAD.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/equipped-OUTERCLOTHING.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/gauntlets.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet-sealed.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet-sealed.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet-sealed.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet-sealed.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/helmet.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon-on.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon-on.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon-on.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon-on.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon.png b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon.png similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon.png rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/icon.png diff --git a/Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/meta.json b/Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/meta.json similarity index 100% rename from Resources/Textures/_TG/Clothing/Modsuit/syndicateelitemodsuit.rsi/meta.json rename to Resources/Textures/_EE/Clothing/Modsuit/syndicateelitemodsuit.rsi/meta.json diff --git a/Resources/Textures/_Imp/Drone/drone.rsi/drone.png b/Resources/Textures/_Impstation/Drone/drone.rsi/drone.png similarity index 100% rename from Resources/Textures/_Imp/Drone/drone.rsi/drone.png rename to Resources/Textures/_Impstation/Drone/drone.rsi/drone.png diff --git a/Resources/Textures/_Imp/Drone/drone.rsi/l_hand.png b/Resources/Textures/_Impstation/Drone/drone.rsi/l_hand.png similarity index 100% rename from Resources/Textures/_Imp/Drone/drone.rsi/l_hand.png rename to Resources/Textures/_Impstation/Drone/drone.rsi/l_hand.png diff --git a/Resources/Textures/_Imp/Drone/drone.rsi/meta.json b/Resources/Textures/_Impstation/Drone/drone.rsi/meta.json similarity index 100% rename from Resources/Textures/_Imp/Drone/drone.rsi/meta.json rename to Resources/Textures/_Impstation/Drone/drone.rsi/meta.json diff --git a/Resources/Textures/_Imp/Drone/drone.rsi/r_hand.png b/Resources/Textures/_Impstation/Drone/drone.rsi/r_hand.png similarity index 100% rename from Resources/Textures/_Imp/Drone/drone.rsi/r_hand.png rename to Resources/Textures/_Impstation/Drone/drone.rsi/r_hand.png diff --git a/Resources/Textures/_Imp/Drone/drone.rsi/shell.png b/Resources/Textures/_Impstation/Drone/drone.rsi/shell.png similarity index 100% rename from Resources/Textures/_Imp/Drone/drone.rsi/shell.png rename to Resources/Textures/_Impstation/Drone/drone.rsi/shell.png diff --git a/Resources/Textures/_Imp/Drone/dronesatchel.rsi/equipped-BACKPACK.png b/Resources/Textures/_Impstation/Drone/dronesatchel.rsi/equipped-BACKPACK.png similarity index 100% rename from Resources/Textures/_Imp/Drone/dronesatchel.rsi/equipped-BACKPACK.png rename to Resources/Textures/_Impstation/Drone/dronesatchel.rsi/equipped-BACKPACK.png diff --git a/Resources/Textures/_Imp/Drone/dronesatchel.rsi/icon.png b/Resources/Textures/_Impstation/Drone/dronesatchel.rsi/icon.png similarity index 100% rename from Resources/Textures/_Imp/Drone/dronesatchel.rsi/icon.png rename to Resources/Textures/_Impstation/Drone/dronesatchel.rsi/icon.png diff --git a/Resources/Textures/_Imp/Drone/dronesatchel.rsi/inhand-left.png b/Resources/Textures/_Impstation/Drone/dronesatchel.rsi/inhand-left.png similarity index 100% rename from Resources/Textures/_Imp/Drone/dronesatchel.rsi/inhand-left.png rename to Resources/Textures/_Impstation/Drone/dronesatchel.rsi/inhand-left.png diff --git a/Resources/Textures/_Imp/Drone/dronesatchel.rsi/inhand-right.png b/Resources/Textures/_Impstation/Drone/dronesatchel.rsi/inhand-right.png similarity index 100% rename from Resources/Textures/_Imp/Drone/dronesatchel.rsi/inhand-right.png rename to Resources/Textures/_Impstation/Drone/dronesatchel.rsi/inhand-right.png diff --git a/Resources/Textures/_Imp/Drone/dronesatchel.rsi/meta.json b/Resources/Textures/_Impstation/Drone/dronesatchel.rsi/meta.json similarity index 100% rename from Resources/Textures/_Imp/Drone/dronesatchel.rsi/meta.json rename to Resources/Textures/_Impstation/Drone/dronesatchel.rsi/meta.json