Remove pill tags (#15891)

2023-04-29 19:44:46 +10:00
parent a372daadb2
commit a4f77b7376
4 changed files with 7 additions and 12 deletions
--- 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:
--- 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
--- 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
--- 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