From c730ecee1e4ebaff06d199881b664294c1bbea02 Mon Sep 17 00:00:00 2001 From: Pandora Date: Thu, 22 Aug 2024 06:19:54 +0100 Subject: [PATCH] Update condiment.dm --- .../items/reagent_containers/food/condiment.dm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/condiment.dm b/code/game/objects/items/reagent_containers/food/condiment.dm index d4eb99d06b..e676b310f1 100644 --- a/code/game/objects/items/reagent_containers/food/condiment.dm +++ b/code/game/objects/items/reagent_containers/food/condiment.dm @@ -86,7 +86,7 @@ to_chat(user, SPAN_NOTICE(" You transfer [trans] units of the condiment to [target].")) /obj/item/reagent_container/food/condiment/on_reagent_change() - if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole") + if(icon_state == "saltshakersmall" || icon_state == "peppermillsmall" || icon_state == "hotsauce_cholula" || icon_state == "hotsauce_franks" || icon_state == "hotsauce_sriracha" || icon_state == "hotsauce_tabasco" || icon_state == "coldsauce_cole" || icon_state == "eggpowder" || icon_state == "milkpowder" || icon_state == "bjpowder" || icon_state == "ojpowder" || icon_state == "ajpowder" || icon_state == "wjpowder" || icon_state == "gjpowder" || icon_state == "pjpowder") return if(reagents.reagent_list.len > 0) switch(reagents.get_master_reagent_id()) @@ -241,13 +241,14 @@ name = "Juice Packet" desc = "A small packet of dehydrated fruit-juice powder. Mix with water for a 'tasty' beverage. This one appears to be missing the label indicating what flavor it is however." w_class = SIZE_TINY - icon_state = "monkeycubewrap" ///Placeholder until actual sprite done, remember to swap out exception on line 89 too + icon_state = "bjpowder" amount_per_transfer_from_this = 1 volume = 6 /obj/item/reagent_container/food/condiment/juice/orange name = "Orange Juice Packet" desc = "A small packet of dehydrated orange-juice powder. Mix with water for a 'tasty' beverage." + icon_state = "ojpowder" /obj/item/reagent_container/food/condiment/juice/orange/Initialize() . = ..() @@ -256,6 +257,7 @@ /obj/item/reagent_container/food/condiment/juice/apple name = "Apple Juice Packet" desc = "A small packet of dehydrated apple-juice powder. Mix with water for a 'tasty' beverage." + icon_state = "ajpowder" /obj/item/reagent_container/food/condiment/juice/apple/Initialize() . = ..() @@ -264,6 +266,7 @@ /obj/item/reagent_container/food/condiment/juice/watermelon name = "Watermelon Juice Packet" desc = "A small packet of dehydrated watermelon-juice powder. Mix with water for a 'tasty' beverage." + icon_state = "wjpowder" /obj/item/reagent_container/food/condiment/juice/watermelon/Initialize() . = ..() @@ -272,6 +275,7 @@ /obj/item/reagent_container/food/condiment/juice/grape name = "Grape Juice Packet" desc = "A small packet of dehydrated grape-juice powder. Mix with water for a 'tasty' beverage." + icon_state = "gjpowder" /obj/item/reagent_container/food/condiment/juice/grape/Initialize() . = ..() @@ -280,6 +284,7 @@ /obj/item/reagent_container/food/condiment/juice/pineapple name = "Pineapple Juice Packet" desc = "A small packet of dehydrated pineapple-juice powder. Mix with water for a 'tasty' beverage." + icon_state = "pjpowder" /obj/item/reagent_container/food/condiment/juice/pineapple/Initialize() . = ..() @@ -288,8 +293,8 @@ /obj/item/reagent_container/food/condiment/juice/egg name = "Powdered Egg Packet" desc = "A small packet of dehydrated egg-whites and egg-yolk powder. Mix with water for a passable alternative to the real deal." - icon_state = "monkeycubewrap" ///Placeholder until actual sprite done, ideally this and milk get different ones from the juices - volume = 10 + icon_state = "eggpowder" + volume = 12 w_class = SIZE_SMALL /obj/item/reagent_container/food/condiment/juice/egg/Initialize() @@ -299,9 +304,9 @@ /obj/item/reagent_container/food/condiment/juice/milk name = "Dehydrated Milk Packet" desc = "A small packet of dehydrated milk powder. Mix with water for a passable alternative to actual milk." - icon_state = "monkeycubewrap" ///Placeholder until actual sprite done + icon_state = "milkpowder" amount_per_transfer_from_this = 1 - volume = 10 + volume = 12 w_class = SIZE_SMALL /obj/item/reagent_container/food/condiment/juice/milk/Initialize()