Skip to content

Commit

Permalink
Update condiment.dm
Browse files Browse the repository at this point in the history
  • Loading branch information
BonniePandora committed Aug 22, 2024
1 parent e18a33a commit c730ece
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions code/game/objects/items/reagent_containers/food/condiment.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down Expand Up @@ -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()
. = ..()
Expand All @@ -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()
. = ..()
Expand All @@ -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()
. = ..()
Expand All @@ -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()
. = ..()
Expand All @@ -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()
. = ..()
Expand All @@ -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()
Expand All @@ -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()
Expand Down

0 comments on commit c730ece

Please sign in to comment.