From a4ed13af4a6e9f80433c4b0bc27760f66d2269e5 Mon Sep 17 00:00:00 2001 From: Velcroboy <107660393+IamVelcroboy@users.noreply.github.com> Date: Mon, 18 Dec 2023 16:51:39 -0600 Subject: [PATCH] Remove duplicate milks (#22721) * Remove duplicate milks * Migration * Inventories * Guidebook --------- Co-authored-by: Jeff --- .../Prototypes/Catalog/Fills/Crates/food.yml | 4 +- .../Catalog/Fills/Lockers/service.yml | 4 +- .../VendingMachines/Inventories/chefvend.yml | 4 +- .../Consumable/Drinks/drinks-cartons.yml | 16 ++++++ .../Consumable/Drinks/trash_drinks.yml | 12 +++++ .../Objects/Consumable/Food/ingredients.yml | 50 ------------------ .../ServerInfo/Guidebook/Service/Chef.xml | 2 +- .../oatmilk.rsi/icon.png} | Bin .../Consumable/Drinks/oatmilk.rsi/meta.json | 1 + .../Consumable/Food/ingredients.rsi/meta.json | 9 ---- .../Food/ingredients.rsi/milk-soy.png | Bin 373 -> 0 bytes .../Consumable/Food/ingredients.rsi/milk.png | Bin 375 -> 0 bytes Resources/migration.yml | 5 ++ 13 files changed, 41 insertions(+), 66 deletions(-) rename Resources/Textures/Objects/Consumable/{Food/ingredients.rsi/milk-oat.png => Drinks/oatmilk.rsi/icon.png} (100%) create mode 100644 Resources/Textures/Objects/Consumable/Drinks/oatmilk.rsi/meta.json delete mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk-soy.png delete mode 100644 Resources/Textures/Objects/Consumable/Food/ingredients.rsi/milk.png diff --git a/Resources/Prototypes/Catalog/Fills/Crates/food.yml b/Resources/Prototypes/Catalog/Fills/Crates/food.yml index 215ce59856..e5ac193fa2 100644 --- 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 b345fe4adb..fa7f47997f 100644 --- 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 ab6ac3295c..f76b640ec7 100644 --- 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 08ad0ffbd0..83f1dea1d4 100644 --- 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 538ef6790a..99aa925c44 100644 --- 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 75c2bb17f5..8657b64b42 100644 --- 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 65a413059c..7d077ca269 100644 --- 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, - + ## 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 index 0000000000..db0ac608ed --- /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 3c66005b04..6633b0b0bd 100644 --- 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 index b36cc5c740f85cdddd69c8369fb620218c0c2a66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmV-*0gC>KP)GUPrMu()yR)$Yhr{vDY{(JZnDe^X(Bm(7CPy^oy*Ve4DyXW;%-NG9A$P<&KnP(t z=d(V2-;+gF?1X%!M46pAmlcWGp*EMc+=r5kg5ja*H z728P{f*@G(DS8LSafH?yD%SvjsMtZ}?V{w11Te-Xm4Ce*0Ql<(0B|w?7+UM~1e`|j zC=h*Le0PKI!Bmu}Q+)9uHSRX?nJ|F6Lg0u%z-eMSr ztM=n4NcriTFplG^wk4a>T7Z-iob#JWq?9B9q?;?tvf1kx0Lrqw`;p>sI9BBc?h9bq TMY$7%00000NkvXXu0mjf((b0w 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 index f6be66ead1235f385a5a33cd73972c32d352b1dd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 375 zcmV--0f_#IP)l&j5Qe{WDsT)Y7?_Dq+&u*@Z%~KqvsB}*PY{R0v`8Gx#9usf4o5{MX+RJbI@IvZ zFmT-N?a#8y0V^vj|I9}0q1yI-U2Nq3Jzm8gMKU*L2hkIxY1$6WM^Pls$Y=+xb*q#b zv@ynrMZ8Fi0bJMR@V3Ww-TQGHhhd1;dN50~1vriaKzIx~=Pb*lOHC7S!<;UJ#{hG> z0I=O|C#@syf~IKzu+~y)i?sm3q~MbTIF7^D$2WETd#}_L#w;WNV7J?K#`c;pLC>~rSyuSI&-r}r%y^zhQ4}bpI2`uC_)oM*0PzU31d)KzZK(CS>TX&qV@6J69aXPdAz*NoN0~tgNgo$`44% VVHru+eJ%h1002ovPDHLkV1oMBq@w@; diff --git a/Resources/migration.yml b/Resources/migration.yml index 3c1dc2dac6..0500e4a179 100644 --- 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