Cherry-picked commit be0d84458adc156a7f2bcb6305a7d6dbb5042c10 from De…

…ltaV-Station/Delta-v/master
Simple-Station · Apr 7, 2024 · a63de25 · a63de25
1 parent b702cbd
commit a63de25
Show file tree

Hide file tree

Showing 147 changed files with 595 additions and 188 deletions.
diff --git a/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl b/Resources/Locale/en-US/deltav/flavors/flavor-profiles.ftl
@@ -25,5 +25,5 @@ flavor-complex-lemondrop = refreshingly tart
 flavor-complex-greengrass = like a holiday in the sun
 flavor-complex-daiquiri = fashionable
 flavor-complex-arsonistsbrew = like ash and flame
-flavor-complex-dulleavene = ominous
+flavor-complex-healthcodeviolation = ominous
 flavor-complex-pumpkin = like pumpkin
diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Consumable/Drinks/drinks.yml
@@ -1,7 +1,7 @@
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkHealthViolationGlass
-  name: health code violation
+  suffix: health code violation
   description: Allegedly it's a cocktail. The warning cone motif seems apt.
   components:
   - type: SolutionContainerManager
@@ -11,13 +11,14 @@
         reagents:
         - ReagentId: HealthViolation
           Quantity: 30
-  - type: Sprite
-    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
+  - type: Icon
+    sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGunmetalGlass
-  name: gunmetal glass
+  suffix: gunmetal
   description: A cloudy mix of rum, cream, and... is that welding fuel? Probably tasty.
   components:
   - type: SolutionContainerManager
@@ -27,13 +28,14 @@
         reagents:
         - ReagentId: Gunmetal
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkLemonDropGlass
-  name: lemon drop
+  suffix: lemon drop
   description: A martini glass filled with a translucent mix of refreshing lemony goodness.
   components:
   - type: SolutionContainerManager
@@ -43,13 +45,14 @@
         reagents:
         - ReagentId: LemonDrop
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkGreenGrassGlass
-  name: green grass
+  suffix: green grass
   description: An odd green cocktail, topped with oranges, ice, and a plastic straw. Curious.
   components:
   - type: SolutionContainerManager
@@ -59,13 +62,14 @@
         reagents:
         - ReagentId: GreenGrass
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkDaiquiriGlass
-  name: classic daiquiri
+  suffix: classic daiquiri
   description: Rum, lime, and simple syrup. Such class, such refinement.
   components:
   - type: SolutionContainerManager
@@ -75,13 +79,14 @@
         reagents:
         - ReagentId: Daiquiri
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkArsonistsBrewGlass
-  name: arsonist's brew
+  suffix: arsonist's brew
   description: It's probably not concerning that it's glowing faintly. Or bubbling. Or smoking. No, not at all.
   components:
   - type: SolutionContainerManager
@@ -91,13 +96,14 @@
         reagents:
         - ReagentId: ArsonistsBrew
           Quantity: 30
-  - type: Sprite
+  - type: Icon
     sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
+    state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkKvassGlass
-  name: kvass glass
+  suffix: kvass
   description: A cool refreshing drink with a taste of socialism.
   components:
     - type: SolutionContainerManager
@@ -107,13 +113,14 @@
           reagents:
             - ReagentId: Kvass
               Quantity: 30
-    - type: Sprite
-      sprite: Objects/Consumable/Drinks/kvass.rsi
+    - type: Icon
+      sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
+      state: icon
 
 - type: entity
-  parent: DrinkGlassBase
+  parent: DrinkGlass
   id: DrinkMothamphetamineGlass
-  name: mothamphetamine
+  suffix: mothamphetamine
   description: A strangely... Fuzzy drink. It has a chaotic aura.
   components:
     - type: SolutionContainerManager
@@ -123,5 +130,6 @@
           reagents:
             - ReagentId: Mothamphetamine
               Quantity: 30
-    - type: Sprite
+    - type: Icon
       sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
+      state: icon
diff --git a/Resources/Prototypes/DeltaV/Flavors/flavors.yml b/Resources/Prototypes/DeltaV/Flavors/flavors.yml
@@ -87,9 +87,9 @@
 
 #Delta V
 - type: flavor
-  id: dulleavene
+  id: healthcodeviolation
   flavorType: Complex
-  description: flavor-complex-dulleavene
+  description: flavor-complex-healthcodeviolation
 
 - type: flavor
   id: gunmetal

diff --git a/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml b/Resources/Prototypes/DeltaV/Reagents/Consumable/Drink/drinks.yml
@@ -4,11 +4,14 @@
   parent: BaseDrink
   desc: reagent-desc-healthviolation
   physicalDesc: reagent-physical-desc-strong-smelling
-  flavor: dulleavene
+  flavor: healthcodeviolation
   color: "#ff7f00"
   metamorphicSprite:
-    sprite: DeltaV/Objects/Consumable/Drinks/dulleavene.rsi
-    state: icon
+    sprite: DeltaV/Objects/Consumable/Drinks/healthcodeviolation.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -41,7 +44,10 @@
   color: "#994422"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/gunmetal.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -67,7 +73,9 @@
   color: "#fff789"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/lemondrop.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
   metabolisms:
     Drink:
       effects:
@@ -87,7 +95,9 @@
   color: "#66aa55"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/greengrass.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 5
+  metamorphicFillBaseName: fill-
   metabolisms:
     Drink:
       effects:
@@ -107,7 +117,10 @@
   color: "#ddffdd"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/daiquiri.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 3
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -127,7 +140,10 @@
   color: "#fff789"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/arsonist.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects:
@@ -158,8 +174,11 @@
   flavor: bread
   color: "#381600"
   metamorphicSprite:
-    sprite: Objects/Consumable/Drinks/kvass.rsi
-    state: icon
+    sprite: DeltaV/Objects/Consumable/Drinks/kvass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
 
 - type: reagent
   id: Mothamphetamine
@@ -171,7 +190,10 @@
   color: "#2fa1ef"
   metamorphicSprite:
     sprite: DeltaV/Objects/Consumable/Drinks/mothamphetamine.rsi
-    state: icon
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false
   metabolisms:
     Drink:
       effects: