lint errors

diff --git a/Resources/Prototypes/Entities/Debugging/drugs.yml b/Resources/Prototypes/Entities/Debugging/drugs.yml
index 2c222b89059f64ced4f9a1da91986a56ee296c64..c9e072a14dd9d1e9d50345c4b8b26d3382708bd4 100644 (file)
--- a/Resources/Prototypes/Entities/Debugging/drugs.yml
+++ b/Resources/Prototypes/Entities/Debugging/drugs.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: [DrinkBase, DrinkGlassBase]
+  parent: [DrinkBase, DrinkBaseGlass]
   id: DrinkMeth
   name: meth  # beer it is. coffee. beer? coff-ee? be-er? c-o... b-e
   description: Just a whole glass of meth.

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
index d55e28453b45421f8dc5253955c5ae07d8eaf26b..b79346321cd6460220c7f16ad9ce05d2f8aaa04e 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base.yml
@@ -68,7 +68,7 @@
 # Pre-opened
 - type: entity
   abstract: true
-  parent: DrinkOpenableBase
+  parent: DrinkBaseOpenable
   id: DrinkBaseOpenableOpen
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
index a4283f6cb5fb0ee079499092f35d212e1f22e86d..14153453123fa86b2c766c513d7b159f16bc10eb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_base_materials.yml
@@ -83,8 +83,9 @@
     damage:
       types:
         Blunt: 5
-  - type: PhysicalComposition
-    materialComposition: [] # To override previous compositions and get recycled
+  - type: Tag
+    tags:
+    - Recyclable
 
 # Fragile plastic
 - type: entity

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
index a8f9f9ce05adfacdfc511c31686d04e1fa22b8bb..d63636b79e40d22671424777911b894ae21f1cdb 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -68,7 +68,7 @@
 
 # created when taking apart an ied
 - type: entity
-  parent: [ DrinkOpenableOpenBase, DrinkColaCan ]
+  parent: [ DrinkBaseOpenableOpen, DrinkColaCan ]
   id: DrinkColaCanEmpty
   suffix: Empty
   components:

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 24548a355a8f06a495034bf9d726333483aa00f1..923d8670a3953a3e745194ff74f6c6a037557e59 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -42,6 +42,9 @@
     fillBaseName: icon-
   - type: StaticPrice
     price: 10
+  - type: Tag
+    tags:
+    - DrinkCup
 
 ## Misc Cups
 
@@ -57,7 +60,7 @@
     price: 125
 
 - type: entity
-  parent: [DrinkBaseCup, DrinkBasePorcelain]
+  parent: DrinkBaseMug
   id: DrinkTeacupEmpty
   name: teacup
   description: A plain white porcelain teacup.
@@ -71,10 +74,8 @@
     - state: icon-0
     - map: ["enum.SolutionContainerLayers.Fill"]
       state: icon-4
-  - type: Appearance
   - type: SolutionContainerVisuals
     maxFillLevels: 4
-    fillBaseName: icon-
 
 - type: entity
   parent: [ DrinkBase, DrinkBaseGlass ]
@@ -109,6 +110,7 @@
   - type: Tag
     tags:
     - DrinkGlass
+    - Recyclable
 
 - type: entity
   parent: [DrinkBase, DrinkBaseCardboard]

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
index e3d830cf800f01d57880b6a1721315465ddf5824..ceea30947467c3a66206ccfd3b204c2f5f0252c3 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_special.yml
@@ -68,9 +68,6 @@
     sprite: Objects/Consumable/Drinks/teapot.rsi
   - type: FitsInDispenser
     solution: drink
-  - type: Tag
-    tags:
-    - DrinkGlass
 
 - type: entity
   parent: BaseStorageItem