From: veprolet <68151557+veprolet@users.noreply.github.com>
Date: Mon, 19 Feb 2024 22:36:46 +0000 (+0100)
Subject: Make pills colorful and labeled (#25284)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=f5cb9a090172336fe1e33e80e3ab4c0d0c5f91e8;p=space-station-14.git

Make pills colorful and labeled (#25284)

* Make pills colorful and labeled

* Inherit pill sprites from parent
---

diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
index 4d0e801617..dd17e54efa 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -345,10 +345,16 @@
 
 # Pills
 - type: entity
-  name: dexalin pill (10u)
+  name: pill (dexalin 10u)
   parent: Pill
   id: PillDexalin
   components:
+  - type: Pill
+    pillType: 15
+  - type: Sprite
+    state: pill16
+  - type: Label
+    currentLabel: dexalin 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -358,20 +364,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (dexalin 10u)
   parent: PillCanister
   id: PillCanisterDexalin
   suffix: Dexalin, 7
   components:
+  - type: Label
+    currentLabel: dexalin 10u
   - type: StorageFill
     contents:
     - id: PillDexalin
       amount: 7
 
 - type: entity
-  name: dylovene pill (10u)
+  name: pill (dylovene 10u)
   parent: Pill
   id: PillDylovene
   components:
+  - type: Pill
+    pillType: 9
+  - type: Sprite
+    state: pill10
+  - type: Label
+    currentLabel: dylovene 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -381,20 +396,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (dylovene 10u)
   parent: PillCanister
   id: PillCanisterDylovene
   suffix: Dylovene, 5
   components:
+  - type: Label
+    currentLabel: dylovene 10u
   - type: StorageFill
     contents:
     - id: PillDylovene
       amount: 5
 
 - type: entity
-  name: hyronalin pill (10u)
+  name: pill (hyronalin 10u)
   parent: Pill
   id: PillHyronalin
   components:
+  - type: Pill
+    pillType: 16
+  - type: Sprite
+    state: pill17
+  - type: Label
+    currentLabel: hyronalin 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -404,20 +428,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (hyronalin 10u)
   parent: PillCanister
   id: PillCanisterHyronalin
   suffix: Hyronalin, 5
   components:
+  - type: Label
+    currentLabel: hyronalin 10u
   - type: StorageFill
     contents:
     - id: PillHyronalin
       amount: 5
 
 - type: entity
-  name: iron pill (10u)
+  name: pill (iron 10u)
   parent: Pill
   id: PillIron
   components:
+  - type: Pill
+    pillType: 13
+  - type: Sprite
+    state: pill14
+  - type: Label
+    currentLabel: iron 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -427,10 +460,16 @@
           Quantity: 10
 
 - type: entity
-  name: copper pill (10u)
+  name: pill (copper 10u)
   parent: Pill
   id: PillCopper
   components:
+  - type: Pill
+    pillType: 12
+  - type: Sprite
+    state: pill13
+  - type: Label
+    currentLabel: copper 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -440,30 +479,42 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (iron 10u)
   parent: PillCanister
   id: PillCanisterIron
   suffix: Iron, 5
   components:
+  - type: Label
+    currentLabel: iron 10u
   - type: StorageFill
     contents:
     - id: PillIron
       amount: 5
 
 - type: entity
+  name: pill canister (copper 10u)
   parent: PillCanister
   id: PillCanisterCopper
   suffix: Copper, 5
   components:
+  - type: Label
+    currentLabel: copper 10u
   - type: StorageFill
     contents:
     - id: PillCopper
       amount: 5
 
 - type: entity
-  name: kelotane pill (10u)
+  name: pill (kelotane 10u)
   parent: Pill
   id: PillKelotane
   components:
+  - type: Pill
+    pillType: 3
+  - type: Sprite
+    state: pill4
+  - type: Label
+    currentLabel: kelotane 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -473,20 +524,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (kelotane 10u)
   parent: PillCanister
   id: PillCanisterKelotane
   suffix: Kelotane, 5
   components:
+  - type: Label
+    currentLabel: kelotane 10u
   - type: StorageFill
     contents:
     - id: PillKelotane
       amount: 5
 
 - type: entity
-  name: dermaline pill (10u)
+  name: pill (dermaline 10u)
   parent: Pill
   id: PillDermaline
   components:
+  - type: Pill
+    pillType: 7
+  - type: Sprite
+    state: pill8
+  - type: Label
+    currentLabel: dermaline 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -496,10 +556,13 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (dermaline 10u)
   parent: PillCanister
   id: PillCanisterDermaline
   suffix: Dermaline, 5
   components:
+  - type: Label
+    currentLabel: dermaline 10u
   - type: StorageFill
     contents:
     - id: PillDermaline
@@ -519,10 +582,16 @@
           Quantity: 15
 
 - type: entity
-  name: tricordrazine pill (10u)
+  name: pill (tricordrazine 10u)
   parent: Pill
   id: PillTricordrazine
   components:
+  - type: Pill
+    pillType: 2
+  - type: Sprite
+    state: pill3
+  - type: Label
+    currentLabel: tricordrazine 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -532,20 +601,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (tricordrazine 10u)
   parent: PillCanister
   id: PillCanisterTricordrazine
   suffix: Tricordrazine, 5
   components:
+  - type: Label
+    currentLabel: tricordrazine 10u
   - type: StorageFill
     contents:
     - id: PillTricordrazine
       amount: 5
 
 - type: entity
-  name: bicaridine pill (10u)
+  name: pill (bicaridine 10u)
   parent: Pill
   id: PillBicaridine
   components:
+  - type: Pill
+    pillType: 4
+  - type: Sprite
+    state: pill5
+  - type: Label
+    currentLabel: bicaridine 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -555,23 +633,29 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (bicaridine 10u)
   parent: PillCanister
   id: PillCanisterBicaridine
   suffix: Bicaridine, 5
   components:
+  - type: Label
+    currentLabel: bicaridine 10u
   - type: StorageFill
     contents:
     - id: PillBicaridine
       amount: 5
 
 - type: entity
-  name: charcoal pill (10u)
+  name: pill (charcoal 10u)
   parent: Pill
   id: PillCharcoal
   components:
+  - type: Pill
+    pillType: 20
   - type: Sprite
-    sprite: Objects/Specific/Chemistry/pills.rsi
     state: pill21
+  - type: Label
+    currentLabel: charcoal 10u
   - type: SolutionContainerManager
     solutions:
       food:
@@ -581,10 +665,13 @@
           Quantity: 10
 
 - type: entity
+  name: pill canister (charcoal 10u)
   parent: PillCanister
   id: PillCanisterCharcoal
   suffix: Charcoal, 3
   components:
+  - type: Label
+    currentLabel: charcoal 10u
   - type: StorageFill
     contents:
     - id: PillCharcoal