removed name field override for pills/canisters

Simple-Station · Jan 14, 2025 · c8d5365 · c8d5365
1 parent 45d1948
commit c8d5365
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 32 deletions.
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml
@@ -347,7 +347,6 @@
 
 # Pills
 - type: entity
-  name: pill
   suffix: Dexalin 10u
   parent: Pill
   id: PillDexalin
@@ -368,7 +367,6 @@
 
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterDexalin
   suffix: Dexalin, 7
@@ -381,7 +379,6 @@
       amount: 7
 
 - type: entity
-  name: pill
   suffix: Dylovene 10u
   parent: Pill
   id: PillDylovene
@@ -401,7 +398,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterDylovene
   suffix: Dylovene, 5
@@ -414,7 +410,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Hyronalin 10u
   parent: Pill
   id: PillHyronalin
@@ -434,7 +429,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterHyronalin
   suffix: Hyronalin, 5
@@ -447,7 +441,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Potassium iodide 10u
   parent: Pill
   id: PillPotassiumIodide
@@ -467,7 +460,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterPotassiumIodide
   suffix: Potassium iodide 10u, 5
@@ -480,7 +472,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Iron 10u
   parent: Pill
   id: PillIron
@@ -500,7 +491,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill
   suffix: Copper 10u
   parent: Pill
   id: PillCopper
@@ -520,7 +510,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterIron
   suffix: Iron, 5
@@ -533,7 +522,6 @@
       amount: 5
 
 - type: entity
-  name: pill canister 
   parent: PillCanister
   id: PillCanisterCopper
   suffix: Copper, 5
@@ -546,7 +534,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Kelotane 10u
   parent: Pill
   id: PillKelotane
@@ -566,7 +553,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister 
   parent: PillCanister
   id: PillCanisterKelotane
   suffix: Kelotane, 5
@@ -579,7 +565,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Dermaline 10u
   parent: Pill
   id: PillDermaline
@@ -599,7 +584,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister 
   parent: PillCanister
   id: PillCanisterDermaline
   suffix: Dermaline, 5
@@ -612,7 +596,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Space drugs 15u
   parent: Pill
   id: PillSpaceDrugs
@@ -628,7 +611,6 @@
           Quantity: 15
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterSpaceDrugs
   suffix: Space Drugs, 5
@@ -641,8 +623,7 @@
       amount: 5
 
 - type: entity
-  name: pill
-  suffix: Pax 10u
+  suffix: Pax
   parent: Pill
   id: PillPax
   components:
@@ -657,7 +638,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterPax
   suffix: Pax, 5
@@ -671,7 +651,6 @@
 
 
 - type: entity
-  name: pill
   suffix: Tricordrazine 10u
   parent: Pill
   id: PillTricordrazine
@@ -691,7 +670,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterTricordrazine
   suffix: Tricordrazine, 5
@@ -704,7 +682,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Bicaridine 10u
   parent: Pill
   id: PillBicaridine
@@ -724,7 +701,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterBicaridine
   suffix: Bicaridine, 5
@@ -737,7 +713,6 @@
       amount: 5
 
 - type: entity
-  name: pill
   suffix: Charcoal 10u
   parent: Pill
   id: PillCharcoal
@@ -757,7 +732,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterCharcoal
   suffix: Charcoal, 3
@@ -770,7 +744,6 @@
       amount: 3
 
 - type: entity
-  name: pill
   suffix: Romerol 10u
   parent: Pill
   id: PillRomerol
@@ -786,7 +759,6 @@
           Quantity: 10
 
 - type: entity
-  name: pill
   suffix: Ambuzol 10u
   parent: Pill
   id: PillAmbuzol
@@ -802,7 +774,6 @@
               Quantity: 10
 
 - type: entity
-  name: pill
   suffix: Ambuzol plus 5u
   parent: Pill
   id: PillAmbuzolPlus

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml b/Resources/Prototypes/Nyanotrasen/Entities/Objects/Specific/Medical/pills.yml
@@ -27,7 +27,6 @@
           Quantity: 20
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterCryptobiolin
   suffix: Cryptobiolin, 5
@@ -54,7 +53,6 @@
           Quantity: 20
 
 - type: entity
-  name: pill canister
   parent: PillCanister
   id: PillCanisterChloralHydrate
   suffix: ChloralHydrate, 5