Reapply "fixes"

This reverts commit 612de15.
Fansana · Aug 23, 2024 · e11cd3f · e11cd3f
1 parent 612de15
commit e11cd3f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git 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
-}
+}
diff --git 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
@@ -21,7 +21,6 @@
   special:
   - !type:AddComponentSpecial
     components:
-    - type: PotentialPsionic
     - type: Psionic
   - !type:AddComponentSpecial
     components: