Remove duplicate milks (#22721)

* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>

Resources/Prototypes/Catalog/Fills/Crates/food.yml

@@ -42,9 +42,9 @@
       amount: 3
     - id: ReagentContainerRice
       amount: 3
-    - id: ReagentContainerMilk
+    - id: DrinkMilkCarton
       amount: 4
-    - id: ReagentContainerMilkSoy
+    - id: DrinkSoyMilkCarton
       amount: 2
     - id: ReagentContainerSugar
       amount: 2

Resources/Prototypes/Catalog/Fills/Lockers/service.yml

@@ -47,9 +47,9 @@
       - id: FoodCondimentBottleEnzyme
       # really, milk should go in the fridge. Unfortunately saltern only has freezers.
       # yes, I'm using this as an excuse to not have to do extra work.
-      - id: ReagentContainerMilk
+      - id: DrinkMilkCarton
         amount: 2
-      - id: ReagentContainerMilkSoy
+      - id: DrinkSoyMilkCarton
 
 - type: entity
   id: ClosetJanitorFilled

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

@@ -14,8 +14,8 @@
     ReagentContainerOliveoil: 2
     MonkeyCubeBox: 1
     FoodContainerEgg: 1
-    ReagentContainerMilk: 2
-    ReagentContainerMilkSoy: 1
+    DrinkMilkCarton: 2
+    DrinkSoyMilkCarton: 1
     FoodButter: 4
     FoodCheese: 1
     FoodMeat: 6

Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml

@@ -126,3 +126,19 @@
           Quantity: 100
   - type: Sprite
     sprite: Objects/Consumable/Drinks/soymilk.rsi
+
+- type: entity
+  parent: DrinkCartonBaseFull
+  id: DrinkOatMilkCarton
+  name: oat milk
+  description: It's oat milk. Tan and nutritious goodness!
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100
+        reagents:
+        - ReagentId: MilkOat
+          Quantity: 100
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/oatmilk.rsi

Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml

@@ -344,3 +344,15 @@
     solutions:
       drink:
         maxVol: 100
+
+- type: entity
+  name: oat milk carton
+  parent: DrinkCartonBaseEmpty
+  id: DrinkCartonOatMilk
+  components:
+  - type: Sprite
+    sprite: Objects/Consumable/Drinks/oatmilk.rsi
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 100

Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml

@@ -203,56 +203,6 @@
         - ReagentId: Sugar
           Quantity: 20
 
-# Milk
-
-- type: entity
-  parent: ReagentPacketBase
-  id: ReagentContainerMilk
-  name: milk
-  description: It's milk. White and nutritious goodness!
-  components:
-  - type: Sprite
-    state: milk
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 50 # at least enough for one cheese
-        reagents:
-        - ReagentId: Milk
-          Quantity: 50
-
-- type: entity
-  parent: ReagentPacketBase
-  id: ReagentContainerMilkSoy
-  name: soy milk
-  description: It's soy milk. White and nutritious goodness!
-  components:
-  - type: Sprite
-    state: milk-soy
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol:  50
-        reagents:
-        - ReagentId: MilkSoy
-          Quantity: 50
-
-- type: entity
-  parent: ReagentPacketBase
-  id: ReagentContainerMilkOat
-  name: oat milk
-  description: It's oat milk. Tan and nutritious goodness!
-  components:
-  - type: Sprite
-    state: milk-oat
-  - type: SolutionContainerManager
-    solutions:
-      food:
-        maxVol: 50
-        reagents:
-        - ReagentId: MilkOat
-          Quantity: 50
-
 # Misc
 
 - type: entity

Resources/ServerInfo/Guidebook/Service/Chef.xml

@@ -58,7 +58,7 @@ Alt-Click on a Cow with a container in your hand. (Beakers, Buckets, Milk Jugs,
 <Box>
 <GuideEntityEmbed Entity="Bucket"/>
 <GuideEntityEmbed Entity="MobCow"/>
-<GuideEntityEmbed Entity="ReagentContainerMilk"/>
+<GuideEntityEmbed Entity="DrinkMilkCarton"/>
 </Box>
 ## How to Butcher:
 In most cases, you should be able to use a knife directly on a creature that's dead. It's best to do this in the freezer, as the results are... messy.

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

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

Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json

@@ -67,15 +67,6 @@
     {
       "name": "mayo"
     },
-    {
-      "name": "milk"
-    },
-    {
-      "name": "milk-soy"
-    },
-    {
-      "name": "milk-oat"
-    },
     {
       "name": "oliveoil"
     },

Resources/migration.yml

@@ -100,3 +100,8 @@ ClothingOuterHardsuitMedic: ClothingOuterHardsuitSyndieMedic
 
 # 2023-12-13
 VendingMachineSmartFridge: SmartFridge
+
+# 2023-12-18
+ReagentContainerMilk: DrinkMilkCarton
+ReagentContainerMilkSoy: DrinkSoyMilkCarton
+ReagentContainerMilkOat: DrinkOatMilkCarton