Merge 8907731102 into c3c6a6abd9

Resources/Locale/en-US/_DV/reagents/meta/consumable/drink/drinks.ftl

@@ -27,3 +27,6 @@ reagent-desc-double-ice-cream = Ice cream, but now with even more ice cream on t
 
 reagent-name-lemon-lime-bitters = lemon lime bitters
 reagent-desc-lemon-lime-bitters = Western Australians love this shit.
+
+reagent-name-coffee-nocaf = nocaf coffee
+reagent-desc-coffee-nocaf = A drink made from brewed chicory and figs. Contains no caffeine.

Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml

@@ -2,6 +2,7 @@
   id: HotDrinksMachineInventory
   startingInventory:
     DrinkHotCoffee: 5
+    DrinkHotCoffeeNocaf: 5 # DeltaV - Added Nocaf Coffee
     DrinkCafeLatte: 5
     DrinkTeacup: 5
     DrinkGreenTea: 5

Resources/Prototypes/_DV/Entities/Objects/Consumable/Drinks/drinks_cups.yml

@@ -0,0 +1,23 @@
+- type: entity
+  parent: DrinkBaseMug
+  id: DrinkHotCoffeeNocaf
+  name: nocaf coffee
+  suffix: Full
+  description: Coffee made from a mixture of barley, ground chicory, and figs. Contains no caffeine.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        reagents:
+        - ReagentId: CoffeeNocaf
+          Quantity: 20
+  - type: Icon
+    sprite: Objects/Consumable/Drinks/mug.rsi
+    state: icon-vend-brown
+  - type: Sprite
+    layers:
+    - state: icon
+    - state: fill-3
+      map: ["enum.SolutionContainerLayers.Fill"]
+  - type: TrashOnSolutionEmpty
+    solution: drink

Resources/Prototypes/_DV/Reagents/Consumable/Drink/drinks.yml

@@ -264,3 +264,24 @@
       effects:
       - !type:SatiateThirst
         factor: 2
+
+- type: reagent
+  parent: BaseDrink
+  id: CoffeeNocaf
+  name: reagent-name-coffee-nocaf
+  desc: reagent-desc-coffee-nocaf
+  physicalDesc: reagent-physical-desc-aromatic
+  flavor: coffee
+  color: "#664300"
+  recognizable: false
+  metabolisms:
+    Drink:
+      effects:
+      - !type:SatiateThirst
+        factor: 2
+  metamorphicSprite:
+    sprite: Objects/Consumable/Drinks/coffeeglass.rsi
+    state: icon_empty
+  metamorphicMaxFillLevels: 4
+  metamorphicFillBaseName: fill-
+  metamorphicChangeColor: false