Root beer, ice cream, and root beer floats (#6334)

Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml

@@ -12,6 +12,7 @@
   - Cola
   - SpaceMountainWind
   - DrGibb
+  - RootBeer
   - SpaceUp
   - TonicWater
   - SodaWater

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

@@ -7,6 +7,7 @@
     DrinkColaCan: 10
     DrinkEnergyDrinkCan: 10
     DrinkGrapeCan: 10
+    DrinkRootBeerCan: 10
     DrinkIcedTeaCan: 10
     DrinkLemonLimeCan: 10
     DrinkSpaceMountainWindCan: 10

Resources/Prototypes/Entities/Objects/Consumable/drinks.yml

@@ -972,6 +972,24 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/iceglass.rsi
 
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkIceCreamGlass
+  name: ice cream glass
+  description: A glass full of good old ice cream. Might want a spoon.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: IceCream
+          Quantity: 50
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/icecreamglass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlassBase
   id: DrinkIrishCarBomb
@@ -1446,6 +1464,42 @@
   - type: Sprite
     sprite: Objects/Consumable/Drinks/rewriter.rsi
 
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkRootBeerGlass
+  name: root beer glass
+  description: Fizzy, foamy, and full of sweet, non-caffienated goodness.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: RootBeer
+          Quantity: 50
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/rootbeerglass.rsi
+    state: icon
+
+- type: entity
+  parent: DrinkGlassBase
+  id: DrinkRootBeerFloatGlass
+  name: root beer float glass
+  description: Fizzy, foamy, and now with ice cream on top! Amazing!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: RootBeerFloat
+          Quantity: 50
+  - type: Drink
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/rootbeerfloatglass.rsi
+    state: icon
+
 - type: entity
   parent: DrinkGlassBase
   id: DrinkRumGlass

Resources/Prototypes/Entities/Objects/Consumable/drinks_cans.yml

@@ -114,6 +114,24 @@
   - type: Item
     sprite: Objects/Consumable/Drinks/purple_can.rsi
 
+- type: entity
+  parent: DrinkCanBaseFull
+  id: DrinkRootBeerCan
+  name: root beer can
+  description: Some of that tasty root beer goodness, now in a portable can!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 30
+        reagents:
+        - ReagentId: RootBeer
+          Quantity: 30
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/rootbeer.rsi
+  - type: Item
+    sprite: Objects/Consumable/Drinks/rootbeer.rsi
+
 - type: entity
   parent: DrinkGlassBase
   id: DrinkSodaWaterCan

Resources/Prototypes/Reagents/Consumable/Drink/soda.yml

@@ -38,6 +38,15 @@
   physicalDesc: fizzy
   color: "#ae94a6"
 
+- type: reagent
+  id: IceCream
+  name: ice cream
+  parent: BaseSoda
+  desc: It was either this or the microwave, and nobody wants ice cream soup!
+  physicalDesc: creamy
+  color: "#fffbd6"
+  spritePath: icecreamglass.rsi
+
 - type: reagent
   id: LemonLime
   name: lemon-lime
@@ -55,6 +64,24 @@
   physicalDesc: fizzy
   color: "#9385bf"
 
+- type: reagent
+  id: RootBeer
+  name: root beer
+  parent: BaseSoda
+  desc: A very sweet, carbonated drink reminiscent of sarsparilla. Goes well with ice cream.
+  physicalDesc: fizzy
+  color: "#381c07"
+  spritePath: rootbeerglass.rsi
+
+- type: reagent
+  id: RootBeerFloat
+  name: root beer float
+  parent: BaseSoda
+  desc: Root beer, but now with ice cream on top. It truly is the magnum opus of Canadian summertime drinks.
+  physicalDesc: fizzy and creamy
+  color: "#4f361f"
+  spritePath: rootbeerfloatglass.rsi
+
 - type: reagent
   id: SpaceMountainWind
   name: Space Mountain Wind

Resources/Prototypes/Recipes/Reactions/drinks.yml

@@ -244,6 +244,18 @@
   products:
     Grog: 2
 
+- type: reaction
+  id: IceCream
+  reactants:
+    Cream:
+      amount: 1
+    Ice:
+      amount: 1
+    Sugar:
+      amount: 1
+  products:
+    IceCream: 3
+
 - type: reaction
   id: IcedCoffee
   reactants:
@@ -440,6 +452,16 @@
   products:
     Rewriter: 2
 
+- type: reaction
+  id: RootBeerFloat
+  reactants:
+    RootBeer:
+      amount: 2
+    IceCream:
+      amount: 1
+  products:
+    RootBeerFloat: 3
+
 - type: reaction
   id: ScrewdriverCocktail
   reactants:

Resources/Textures/Objects/Consumable/Drinks/icecreamglass.rsi/meta.json

@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "edited version of https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}

Resources/Textures/Objects/Consumable/Drinks/rootbeer.rsi/meta.json

@@ -0,0 +1,25 @@
+{
+  "version": 1,
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "license": "CC-BY-SA-3.0",
+  "copyright": "https://github.com/discordia-space/CEV-Eris/raw/9c980cb9bc84d07b1c210c5447798af525185f80/icons/obj/food.dmi (EDITED BY Plasmaguy#6148 [Discord, liable to change] / jrjr3000 [Steam])",
+  "states": [
+    {
+      "name": "icon"
+    },
+	  {
+	    "name": "icon_open"
+  	},
+    {
+      "name": "inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    }
+  ]
+}

Resources/Textures/Objects/Consumable/Drinks/rootbeerfloatglass.rsi/meta.json

@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "(Edited by jrjr3000) https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}

Resources/Textures/Objects/Consumable/Drinks/rootbeerglass.rsi/meta.json

@@ -0,0 +1 @@
+{"version": 1, "size": {"x": 32, "y": 32}, "license": "CC-BY-SA-3.0", "copyright": "(Edited by jrjr3000) https://github.com/discordia-space/CEV-Eris/raw/f7aa28fd4b4d0386c3393d829681ebca526f1d2d/icons/obj/drinks.dmi", "states": [{"name": "icon"}]}