From e11cd3f0f19648f8f1fa800b7837744500dcfa50 Mon Sep 17 00:00:00 2001
From: FoxxoTrystan <trystan.garnierhein@gmail.com>
Date: Fri, 23 Aug 2024 21:06:22 +0200
Subject: [PATCH] Reapply "fixes"

This reverts commit 612de155fd2d75218a45a8d771df4ddc480ea726.
---
 Content.Shared/Clothing/EntitySystems/ClothingSystem.cs    | 7 ++++++-
 .../Prototypes/Entities/Structures/Specific/oracle.yml     | 1 -
 .../Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml   | 1 -
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
index bef4e46e963..10fd864bd46 100644
--- a/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
+++ b/Content.Shared/Clothing/EntitySystems/ClothingSystem.cs
@@ -69,6 +69,11 @@ private void QuickEquip(
     {
         foreach (var slotDef in userEnt.Comp1.Slots)
         {
+            // Do not attempt to quick-equip clothing in pocket slots.
+            // We should probably add a special flag to SlotDefinition to skip quick equip if more similar slots get added.
+            if (slotDef.SlotFlags.HasFlag(SlotFlags.POCKET))
+                continue;
+
             if (!_invSystem.CanEquip(userEnt, toEquipEnt, slotDef.Name, out _, slotDef, userEnt, toEquipEnt))
                 continue;
 
@@ -275,4 +280,4 @@ public void SetLayerState(ClothingComponent clothing, string slot, string mapKey
     }
 
     #endregion
-}
+}
\ No newline at end of file
diff --git a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
index 50a8488bd8b..51a25bffcdc 100644
--- a/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
+++ b/Resources/Prototypes/Entities/Structures/Specific/oracle.yml
@@ -15,7 +15,6 @@
         state: oracle-0
   - type: Speech
     speechSounds: Tenor
-  - type: PotentialPsionic
   - type: Psionic
   - type: SolutionContainerManager
     solutions:
diff --git a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
index 16589cb322e..148476b230e 100644
--- a/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
+++ b/Resources/Prototypes/Nyanotrasen/Roles/Jobs/Epistemics/forensicmantis.yml
@@ -21,7 +21,6 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PotentialPsionic
     - type: Psionic
   - !type:AddComponentSpecial
     components: