From: Tayrtahn <tayrtahn@gmail.com>
Date: Thu, 27 Jun 2024 02:08:56 +0000 (-0400)
Subject: Fix double labels on pills and pill canisters (#29499)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f1e7b4c499339c5abdf587a6d6e249e12c9222a0;p=space-station-14.git

Fix double labels on pills and pill canisters (#29499)
---

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 13ebe4b8f4..d83a292ebe 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -347,7 +347,8 @@
 
 # Pills
 - type: entity
-  name: pill (dexalin 10u)
+  name: pill
+  suffix: Dexalin 10u
   parent: Pill
   id: PillDexalin
   components:
@@ -366,10 +367,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (dexalin 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterDexalin
-  suffix: Dexalin, 7
+  suffix: Dexalin 10u, 7
   components:
   - type: Label
     currentLabel: dexalin 10u
@@ -379,7 +380,8 @@
       amount: 7
 
 - type: entity
-  name: pill (dylovene 10u)
+  name: pill
+  suffix: Dylovene 10u
   parent: Pill
   id: PillDylovene
   components:
@@ -398,10 +400,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (dylovene 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterDylovene
-  suffix: Dylovene, 5
+  suffix: Dylovene 10u, 5
   components:
   - type: Label
     currentLabel: dylovene 10u
@@ -411,7 +413,8 @@
       amount: 5
 
 - type: entity
-  name: pill (hyronalin 10u)
+  name: pill
+  suffix: Hyronalin 10u
   parent: Pill
   id: PillHyronalin
   components:
@@ -430,10 +433,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (hyronalin 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterHyronalin
-  suffix: Hyronalin, 5
+  suffix: Hyronalin 10u, 5
   components:
   - type: Label
     currentLabel: hyronalin 10u
@@ -443,7 +446,8 @@
       amount: 5
 
 - type: entity
-  name: pill (iron 10u)
+  name: pill
+  suffix: Iron 10u
   parent: Pill
   id: PillIron
   components:
@@ -462,7 +466,8 @@
           Quantity: 10
 
 - type: entity
-  name: pill (copper 10u)
+  name: pill
+  suffix: Copper 10u
   parent: Pill
   id: PillCopper
   components:
@@ -481,10 +486,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (iron 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterIron
-  suffix: Iron, 5
+  suffix: Iron 10u, 5
   components:
   - type: Label
     currentLabel: iron 10u
@@ -494,10 +499,10 @@
       amount: 5
 
 - type: entity
-  name: pill canister (copper 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterCopper
-  suffix: Copper, 5
+  suffix: Copper 10u, 5
   components:
   - type: Label
     currentLabel: copper 10u
@@ -507,7 +512,8 @@
       amount: 5
 
 - type: entity
-  name: pill (kelotane 10u)
+  name: pill
+  suffix: Kelotane 10u
   parent: Pill
   id: PillKelotane
   components:
@@ -526,10 +532,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (kelotane 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterKelotane
-  suffix: Kelotane, 5
+  suffix: Kelotane 10u, 5
   components:
   - type: Label
     currentLabel: kelotane 10u
@@ -539,7 +545,8 @@
       amount: 5
 
 - type: entity
-  name: pill (dermaline 10u)
+  name: pill
+  suffix: Dermaline 10u
   parent: Pill
   id: PillDermaline
   components:
@@ -558,10 +565,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (dermaline 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterDermaline
-  suffix: Dermaline, 5
+  suffix: Dermaline 10u, 5
   components:
   - type: Label
     currentLabel: dermaline 10u
@@ -584,7 +591,8 @@
           Quantity: 15
 
 - type: entity
-  name: pill (tricordrazine 10u)
+  name: pill
+  suffix: Tricordrazine 10u
   parent: Pill
   id: PillTricordrazine
   components:
@@ -603,10 +611,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (tricordrazine 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterTricordrazine
-  suffix: Tricordrazine, 5
+  suffix: Tricordrazine 10u, 5
   components:
   - type: Label
     currentLabel: tricordrazine 10u
@@ -616,7 +624,8 @@
       amount: 5
 
 - type: entity
-  name: pill (bicaridine 10u)
+  name: pill
+  suffix: Bicaridine 10u
   parent: Pill
   id: PillBicaridine
   components:
@@ -635,10 +644,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (bicaridine 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterBicaridine
-  suffix: Bicaridine, 5
+  suffix: Bicaridine 10u, 5
   components:
   - type: Label
     currentLabel: bicaridine 10u
@@ -648,7 +657,8 @@
       amount: 5
 
 - type: entity
-  name: pill (charcoal 10u)
+  name: pill
+  suffix: Charcoal 10u
   parent: Pill
   id: PillCharcoal
   components:
@@ -667,10 +677,10 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister (charcoal 10u)
+  name: pill canister
   parent: PillCanister
   id: PillCanisterCharcoal
-  suffix: Charcoal, 3
+  suffix: Charcoal 10u, 3
   components:
   - type: Label
     currentLabel: charcoal 10u