Merge sugar and glucose, touch up how some drinks metabolize. (#7398)

2022-05-22 04:25:38 -04:00
parent ab2ef53412
commit a05abd106c
15 changed files with 392 additions and 66 deletions
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cans.yml
@@ -76,9 +76,7 @@
        maxVol: 30
        reagents:
        - ReagentId: IcedTea
-          Quantity: 28
-        - ReagentId: Theobromine
-          Quantity: 2
+          Quantity: 30
  - type: Sprite
    sprite: Objects/Consumable/Drinks/ice_tea_can.rsi
  - type: Item
@@ -238,9 +236,7 @@
        maxVol: 30
        reagents:
        - ReagentId: FourteenLoko
-          Quantity: 28
-        - ReagentId: Theobromine
-          Quantity: 2
+          Quantity: 30
  - type: Sprite
    sprite: Objects/Consumable/Drinks/fourteen_loko.rsi
  - type: Item
@@ -296,9 +292,7 @@
        maxVol: 30
        reagents:
        - ReagentId: EnergyDrink
-          Quantity: 28
-        - ReagentId: Theobromine
-          Quantity: 2
+          Quantity: 30
  - type: Drink
  - type: Sprite
    sprite: Objects/Consumable/Drinks/energy_drink.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks_cups.yml
@@ -170,9 +170,7 @@
      drink:
        reagents:
        - ReagentId: Coffee
-          Quantity: 19
-        - ReagentId: Theobromine
-          Quantity: 1
+          Quantity: 20
        maxVol: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/hot_coffee.rsi
@@ -188,9 +186,7 @@
      drink:
        reagents:
        - ReagentId: Tea
-          Quantity: 19
-        - ReagentId: Theobromine
-          Quantity: 1
+          Quantity: 20
        maxVol: 20
  - type: Sprite
    sprite: Objects/Consumable/Drinks/teacup.rsi
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/cake.yml
@@ -485,7 +485,7 @@
          Quantity: 20
        - ReagentId: Vitamin
          Quantity: 5
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 15

 - type: entity
@@ -510,7 +510,7 @@
          Quantity: 4
        - ReagentId: Vitamin
          Quantity: 1
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 3
 # Tastes like sweetness, cake, vanilla.

@@ -537,7 +537,7 @@
          Quantity: 20
        - ReagentId: Vitamin
          Quantity: 5
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 15

 - type: entity
@@ -562,7 +562,7 @@
          Quantity: 4
        - ReagentId: Vitamin
          Quantity: 1
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 3
 # Tastes like sweetness, cake, clown.

--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/Baked/donkpocket.yml
@@ -221,7 +221,7 @@
          Quantity: 10
        - ReagentId: Omnizine
          Quantity: 2
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 2

 - type: entity
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
@@ -85,7 +85,7 @@
    solutions:
      food:
        reagents:
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 10
  - type: Produce
    seedId: sugarcane
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Food/soup.yml
@@ -306,7 +306,7 @@
          Quantity: 3
        - ReagentId: Milk ##This is probably a reference to something but I don't get it
          Quantity: 5
-        - ReagentId: Glucose
+        - ReagentId: Sugar
          Quantity: 5
 # Tastes like rice, sweetness.