From d0a57fa214be7cb107df22cb61da1bf1d7a1a3a2 Mon Sep 17 00:00:00 2001
From: iaada <iaada@users.noreply.github.com>
Date: Sun, 27 Jul 2025 14:27:02 -0500
Subject: [PATCH] lint errors

---
 Resources/Prototypes/Entities/Debugging/drugs.yml         | 2 +-
 .../Entities/Objects/Consumable/Drinks/drinks_base.yml    | 2 +-
 .../Objects/Consumable/Drinks/drinks_base_materials.yml   | 5 +++--
 .../Entities/Objects/Consumable/Drinks/drinks_cans.yml    | 2 +-
 .../Entities/Objects/Consumable/Drinks/drinks_cups.yml    | 8 +++++---
 .../Entities/Objects/Consumable/Drinks/drinks_special.yml | 3 ---
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Resources/Prototypes/Entities/Debugging/drugs.yml b/Resources/Prototypes/Entities/Debugging/drugs.yml
index 2c222b8905..c9e072a14d 100644
--- 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 d55e28453b..b79346321c 100644
--- 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 a4283f6cb5..1415345312 100644
--- 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 a8f9f9ce05..d63636b79e 100644
--- 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 24548a355a..923d8670a3 100644
--- 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 e3d830cf80..ceea309474 100644
--- 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
-- 
2.51.2