diff --git a/Content.Server/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs b/Content.Shared/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
similarity index 88%
rename from Content.Server/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
rename to Content.Shared/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
index ceff6c582d..3d55cd9a8c 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/Components/Faction/ClothingAddFactionComponent.cs
@@ -1,11 +1,12 @@
+using Content.Shared.NPC.Prototypes;
 using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
 
-namespace Content.Server.NPC.Components
+namespace Content.Shared.NPC.Components
 {
-    [RegisterComponent]
     /// <summary>
     /// Allows clothing to add a faction to you when you wear it.
     /// </summary>
+    [RegisterComponent]
     public sealed partial class ClothingAddFactionComponent : Component
     {
         public bool IsActive = false;
diff --git a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
similarity index 95%
rename from Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
rename to Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
index 3ce0ca73eb..385f3a1099 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Core.cs
@@ -1,6 +1,6 @@
-using Content.Server.NPC.Components;
+using Content.Shared.NPC.Components;
 
-namespace Content.Server.NPC.Systems;
+namespace Content.Shared.NPC.Systems;
 
 public partial class NpcFactionSystem : EntitySystem
 {
diff --git a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
similarity index 78%
rename from Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
rename to Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
index 0b971c3394..012b59c6cc 100644
--- a/Content.Server/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
+++ b/Content.Shared/Nyanotrasen/NPC/Systems/FactionSystem.Items.cs
@@ -1,15 +1,14 @@
-using Content.Server.NPC.Components;
-using Content.Server.Store.Systems;
 using Content.Shared.Clothing.Components;
 using Content.Shared.Inventory.Events;
+using Content.Shared.NPC.Components;
 
-namespace Content.Server.NPC.Systems;
+namespace Content.Shared.NPC.Systems;
 
 public partial class NpcFactionSystem : EntitySystem
 {
     public void InitializeItems()
     {
-        SubscribeLocalEvent<NpcFactionMemberComponent, ItemPurchasedEvent>(OnItemPurchased);
+        // SubscribeLocalEvent<NpcFactionMemberComponent, ItemPurchasedEvent>(OnItemPurchased);
 
         SubscribeLocalEvent<ClothingAddFactionComponent, GotEquippedEvent>(OnClothingEquipped);
         SubscribeLocalEvent<ClothingAddFactionComponent, GotUnequippedEvent>(OnClothingUnequipped);
@@ -19,10 +18,10 @@ public partial class NpcFactionSystem : EntitySystem
     /// If we bought something we probably don't want it to start biting us after it's automatically placed in our hands.
     /// If you do, consider finding a better solution to grenade penguin CBT.
     /// </summary>
-    private void OnItemPurchased(EntityUid uid, NpcFactionMemberComponent component, ref ItemPurchasedEvent args)
-    {
-        component.ExceptionalFriendlies.Add(args.Purchaser);
-    }
+    // private void OnItemPurchased(EntityUid uid, NpcFactionMemberComponent component, ref ItemPurchasedEvent args)
+    // {
+    //     component.ExceptionalFriendlies.Add(args.Purchaser);
+    // }
 
     private void OnClothingEquipped(EntityUid uid, ClothingAddFactionComponent component, GotEquippedEvent args)
     {