From: iaada <iaada@users.noreply.github.com>
Date: Sat, 26 Jul 2025 09:17:55 +0000 (-0500)
Subject: material arbitrage
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=68ccb2881f44661d548d6138064171dfc207adb3;p=space-station-14.git

material arbitrage
---

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
index 2a8a4127d0..b0d3eeaa6d 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -25,7 +25,7 @@
 # A mug is a type of cup.[2]
 - type: entity
   abstract: true
-  parent: [DrinkBaseCup, DrinkGlassBase]
+  parent: DrinkBaseCup, # add DrinkGlassBase after fixing the material arbitrage
   id: DrinkBaseMug
   name: mug
   description: A mug.