From a4f77b7376594682191b9b221bb48757dc0463f0 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Sat, 29 Apr 2023 19:44:46 +1000
Subject: [PATCH] Remove pill tags (#15891)

---
 Resources/Prototypes/Entities/Clothing/Belt/belts.yml     | 5 +++--
 .../Entities/Objects/Specific/Chemistry/chem_bag.yml      | 3 ++-
 .../Prototypes/Entities/Objects/Specific/chemistry.yml    | 8 ++------
 Resources/Prototypes/tags.yml                             | 3 ---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
index be11fbdd3f..7da9f3fe00 100644
--- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
+++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml
@@ -241,12 +241,12 @@
         - Gauze
         - Ointment
         - CigPack
-        - Pill
         - PillCanister
         - Radio
       components:
         - Hypospray
         - Injector
+        - Pill
   - type: ItemMapper
     mapLayers:
       bottle:
@@ -259,8 +259,9 @@
           - Hypospray
       pill:
         whitelist:
-          tags:
+          components:
           - Pill
+          tags:
           - PillCanister
       bottle_spray:
         whitelist:
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
index ad17f17e1e..90f47359b3 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Chemistry/chem_bag.yml
@@ -20,9 +20,10 @@
     quickInsert: true
     areaInsert: true
     whitelist:
+      components:
+        - Pill
       tags:
         - PillCanister
-        - Pill
         - Bottle
         - Syringe
   - type: Dumpable
diff --git a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
index 0f1f81e74e..08d953afa2 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
@@ -284,10 +284,6 @@
     size: 1
     sprite: Objects/Specific/Chemistry/pills.rsi
   - type: Pill
-  # TODO remove pill tag?
-  - type: Tag
-    tags:
-      - Pill
   - type: Food
     forceFeedDelay: 1
     transferAmount: null
@@ -342,6 +338,6 @@
     storageInsertSound: /Audio/Effects/pill_insert.ogg
     storageRemoveSound: /Audio/Effects/pill_remove.ogg
     whitelist:
-      tags:
-        - Pill
+      components:
+      - Pill
   - type: Dumpable
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index 1ca6ef7296..46fa7a7c9b 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -492,9 +492,6 @@
 - type: Tag
   id: Pickaxe
 
-- type: Tag
-  id: Pill
-
 - type: Tag
   id: PillCanister
 
-- 
2.51.2