Remove duplicate milks (#22721)

* Remove duplicate milks

* Migration

* Inventories

* Guidebook

---------

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

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml
index 215ce59856f3eb5554082c8c7620f473544bdde5..e5ac193fa23ba548891ff6f5bfe07c73b62ce414 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Crates/food.yml
+++ b/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

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml b/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
index b345fe4adb61139fc4c18206eeb35e1ee1ae2a3d..fa7f47997f05809cd705a4369f64e7836b6521d5 100644 (file)
--- a/Resources/Prototypes/Catalog/Fills/Lockers/service.yml
+++ b/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

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
index ab6ac3295c1ea8f3150729d115a53969948b43d8..f76b640ec75c921670f0b99e5fc89a1836e8b8f5 100644 (file)
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
index 08ad0ffbd04244f34303c359017484db4a8327a0..83f1dea1d4be46344cf6c72b54916d377368f13f 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks-cartons.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
index 538ef6790a89fafa7c4a0a6e781ba0749e154d56..99aa925c44c7f11aaf29960f1a2eee1d37d7dbed 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/trash_drinks.yml
+++ b/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

diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml b/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
index 75c2bb17f583f042241678473e0fcdebd994664a..8657b64b42cbf6737fc7c7ff6c13b48aeac1b522 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Consumable/Food/ingredients.yml
+++ b/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

diff --git a/Resources/ServerInfo/Guidebook/Service/Chef.xml b/Resources/ServerInfo/Guidebook/Service/Chef.xml
index 65a413059cddde9830797eb2a044bb3ea5328899..7d077ca269b46dc9a4f2adbba1833486c1a7287e 100644 (file)
--- a/Resources/ServerInfo/Guidebook/Service/Chef.xml
+++ b/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.

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-oat.png b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/icon.png
similarity index 100%
rename from Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-oat.png
rename to Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/icon.png

diff --git a/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json b/Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json
new file mode 100644 (file)
index 0000000..db0ac60
--- /dev/null
+++ b/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"}]}
\ No newline at end of file

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
index 3c66005b04ba48f4f85972bf34c4136b38eaffc2..6633b0b0bd660c0ace7fe38410ed7f174f28d588 100644 (file)
--- a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/meta.json
+++ b/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"
     },

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png
deleted file mode 100644 (file)
index b36cc5c..0000000
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png and /dev/null differ

diff --git a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png b/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png
deleted file mode 100644 (file)
index f6be66e..0000000
Binary files a/Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png and /dev/null differ

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 3c1dc2dac6a75061d4d4b72fb7cefe0f7ecb42a9..0500e4a179860a7d2e2728b3c83045518990b85c 100644 (file)
--- a/Resources/migration.yml
+++ b/Resources/migration.yml
@@ -100,3 +100,8 @@ ClothingOuterHardsuitMedic: ClothingOuterHardsuitSyndieMedic
 
 # 2023-12-13
 VendingMachineSmartFridge: SmartFridge
+
+# 2023-12-18
+ReagentContainerMilk: DrinkMilkCarton
+ReagentContainerMilkSoy: DrinkSoyMilkCarton
+ReagentContainerMilkOat: DrinkOatMilkCarton