From 355e16f4701ca0751e2fad0490fc4179d91c7b5c Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Mon, 13 Nov 2023 10:29:46 +1100
Subject: [PATCH] fix implant action icon bug (#21597)

---
 .../Systems/Actions/ActionUIController.cs             |  8 ++++++--
 .../Entities/Objects/Misc/subdermal_implants.yml      | 11 +++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
index e2de86201e..340aa5447d 100644
--- a/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
+++ b/Content.Client/UserInterface/Systems/Actions/ActionUIController.cs
@@ -767,11 +767,15 @@ public sealed class ActionUIController : UIController, IOnStateChanged<GameplayS
 
     private bool OnMenuBeginDrag()
     {
+        // TODO ACTIONS
+        // The dragging icon shuld be based on the entity's icon style. I.e. if the action has a large icon texture,
+        // and a small item/provider sprite, then the dragged icon should be the big texture, not the provider.
         if (_actionsSystem != null && _actionsSystem.TryGetActionData(_menuDragHelper.Dragged?.ActionId, out var action))
         {
-            if (EntityManager.TryGetComponent(action.EntityIcon, out SpriteComponent? sprite))
+            if (EntityManager.TryGetComponent(action.EntityIcon, out SpriteComponent? sprite)
+                && sprite.Icon?.GetFrame(RsiDirection.South, 0) is {} frame)
             {
-                _dragShadow.Texture = sprite.Icon?.GetFrame(RsiDirection.South, 0);
+                _dragShadow.Texture = frame;
             }
             else if (action.Icon != null)
             {
diff --git a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
index d8d808c893..f893ba91d4 100644
--- a/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
+++ b/Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
@@ -1,15 +1,14 @@
 - type: entity
-  parent: BaseItem
   id: BaseSubdermalImplant
   name: implant
   description: A microscopic chip that's injected under the skin.
   abstract: true
   components:
-    - type: SubdermalImplant
-    - type: Tag
-      tags:
-        - SubdermalImplant
-        - HideContextMenu
+  - type: SubdermalImplant
+  - type: Tag
+    tags:
+    - SubdermalImplant
+    - HideContextMenu
 
 #Fun implants