diff --git a/code/modules/asset_cache/assets/condiments.dm b/code/modules/asset_cache/assets/condiments.dm index 89bd3eed0cf..d5a7490904d 100644 --- a/code/modules/asset_cache/assets/condiments.dm +++ b/code/modules/asset_cache/assets/condiments.dm @@ -1,22 +1,24 @@ /datum/asset/spritesheet/simple/condiments name = "condiments" assets = list( - CONDIMASTER_STYLE_FALLBACK = 'icons/ui_icons/condiments/emptycondiment.png', - "enzyme" = 'icons/ui_icons/condiments/enzyme.png', + CONDIMASTER_STYLE_FALLBACK = 'icons/ui_icons/condiments/bottle.png', "flour" = 'icons/ui_icons/condiments/flour.png', - "mayonnaise" = 'icons/ui_icons/condiments/mayonnaise.png', - "milk" = 'icons/ui_icons/condiments/milk.png', - "blackpepper" = 'icons/ui_icons/condiments/peppermillsmall.png', "rice" = 'icons/ui_icons/condiments/rice.png', - "sodiumchloride" = 'icons/ui_icons/condiments/saltshakersmall.png', - "soymilk" = 'icons/ui_icons/condiments/soymilk.png', - "soysauce" = 'icons/ui_icons/condiments/soysauce.png', "sugar" = 'icons/ui_icons/condiments/sugar.png', - "ketchup" = 'icons/ui_icons/condiments/ketchup.png', + "milk" = 'icons/ui_icons/condiments/milk.png', + "enzyme" = 'icons/ui_icons/condiments/enzyme.png', "capsaicin" = 'icons/ui_icons/condiments/hotsauce.png', "frostoil" = 'icons/ui_icons/condiments/coldsauce.png', "bbqsauce" = 'icons/ui_icons/condiments/bbqsauce.png', - "cornoil" = 'icons/ui_icons/condiments/oliveoil.png', + "soymilk" = 'icons/ui_icons/condiments/soymilk.png', + "soysauce" = 'icons/ui_icons/condiments/soysauce.png', + "ketchup" = 'icons/ui_icons/condiments/ketchup.png', + "mayonnaise" = 'icons/ui_icons/condiments/mayonnaise.png', + "oliveoil" = 'icons/ui_icons/condiments/oliveoil.png', + "cooking_oil" = 'icons/ui_icons/condiments/cookingoil.png', "peanut_butter" = 'icons/ui_icons/condiments/peanutbutter.png', "cherryjelly" = 'icons/ui_icons/condiments/cherryjelly.png', + "honey" = 'icons/ui_icons/condiments/honey.png', + "blackpepper" = 'icons/ui_icons/condiments/peppermillsmall.png', + "sodiumchloride" = 'icons/ui_icons/condiments/saltshakersmall.png', ) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index b3a53749d89..3d7570894db 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -536,25 +536,27 @@ if (!styles.len) //Possible_states has the reagent type as key and a list of, in order, the icon_state, the name and the desc as values. Was used in the condiment/on_reagent_change(changetype) to change names, descs and sprites. styles += list( - CONDIMASTER_STYLE_FALLBACK = list("icon_state" = "emptycondiment", "icon_empty" = "", "name" = "condiment bottle", "desc" = "Just your average condiment bottle.", "fill_icon_thresholds" = list(0, 10, 25, 50, 75, 100), "generate_name" = TRUE), - "enzyme" = list("icon_state" = "enzyme", "icon_empty" = "", "name" = "universal enzyme bottle", "desc" = "Used in cooking various dishes."), + CONDIMASTER_STYLE_FALLBACK = list("icon_state" = "bottle", "icon_empty" = "", "name" = "bottle", "desc" = "Just your average condiment bottle.", "fill_icon_thresholds" = list(1, 20, 40, 60, 80, 100), "generate_name" = TRUE), + "flour" = list("icon_state" = "flour", "icon_empty" = "", "name" = "flour sack", "desc" = "A big bag of flour. Good for baking!"), - "mayonnaise" = list("icon_state" = "mayonnaise", "icon_empty" = "", "name" = "mayonnaise jar", "desc" = "An oily condiment made from egg yolks."), - "milk" = list("icon_state" = "milk", "icon_empty" = "", "name" = "space milk", "desc" = "It's milk. White and nutritious goodness!"), - "blackpepper" = list("icon_state" = "peppermillsmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."), "rice" = list("icon_state" = "rice", "icon_empty" = "", "name" = "rice sack", "desc" = "A big bag of rice. Good for cooking!"), - "sodiumchloride" = list("icon_state" = "saltshakersmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."), - "soymilk" = list("icon_state" = "soymilk", "icon_empty" = "", "name" = "soy milk", "desc" = "It's soy milk. White and nutritious goodness!"), - "soysauce" = list("icon_state" = "soysauce", "inhand_icon_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."), "sugar" = list("icon_state" = "sugar", "icon_empty" = "", "name" = "sugar sack", "desc" = "Tasty spacey sugar!"), - "ketchup" = list("icon_state" = "ketchup", "icon_empty" = "", "name" = "ketchup bottle", "desc" = "A tomato slurry in a tall plastic bottle. Somehow still vaguely American."), + "enzyme" = list("icon_state" = "enzyme", "icon_empty" = "", "name" = "universal enzyme bottle", "desc" = "Used in cooking various dishes."), "capsaicin" = list("icon_state" = "hotsauce", "icon_empty" = "", "name" = "hotsauce bottle", "desc" = "You can almost TASTE the stomach ulcers!"), "frostoil" = list("icon_state" = "coldsauce", "icon_empty" = "", "name" = "coldsauce bottle", "desc" = "Leaves the tongue numb from its passage."), - "cornoil" = list("icon_state" = "oliveoil", "icon_empty" = "", "name" = "corn oil bottle", "desc" = "A delicious oil used in cooking. Made from corn."), + "mayonnaise" = list("icon_state" = "mayonnaise", "icon_empty" = "", "name" = "mayonnaise bottle", "desc" = "An oily condiment made from egg yolks."), + "ketchup" = list("icon_state" = "ketchup", "icon_empty" = "", "name" = "ketchup bottle", "desc" = "A tomato slurry in a tall plastic bottle. Somehow still vaguely American."), + "blackpepper" = list("icon_state" = "peppermillsmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "pepper mill", "desc" = "Often used to flavor food or make people sneeze."), + "sodiumchloride" = list("icon_state" = "saltshakersmall", "inhand_icon_state" = "", "icon_empty" = "emptyshaker", "name" = "salt shaker", "desc" = "Salt. From dead crew, presumably."), + "milk" = list("icon_state" = "milk", "icon_empty" = "", "name" = "space milk", "desc" = "It's milk. White and nutritious goodness!"), + "soymilk" = list("icon_state" = "soymilk", "icon_empty" = "", "name" = "soy milk", "desc" = "It's soy milk. White and nutritious goodness!"), + "soysauce" = list("icon_state" = "soysauce", "inhand_icon_state" = "", "icon_empty" = "", "name" = "soy sauce bottle", "desc" = "A salty soy-based flavoring."), "bbqsauce" = list("icon_state" = "bbqsauce", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included."), + "oliveoil" = list("icon_state" = "oliveoil", "icon_empty" = "", "name" = "olive oil bottle", "desc" = "A delicious oil made from olives."), + "cooking_oil" = list("icon_state" = "cooking_oil", "icon_empty" = "", "name" = "cooking oil bottle", "desc" = "A cooking oil for deep frying."), "peanut_butter" = list("icon_state" = "peanutbutter", "icon_empty" = "", "name" = "peanut butter jar", "desc" = "A creamy paste made from ground peanuts."), - "honey" = list("icon_state" = "honey", "icon_empty" = "", "name" = "honey bottle", "desc" = "A cheerful bear-shaped bottle of tasty honey."), "cherryjelly" = list("icon_state" = "cherryjelly", "icon_empty" = "", "name" = "cherry jelly jar", "desc" = "A jar of super-sweet cherry jelly."), + "honey" = list("icon_state" = "honey", "icon_empty" = "", "name" = "honey bottle", "desc" = "A cheerful bear-shaped bottle of tasty honey."), ) var/list/carton_in_hand = list( "inhand_icon_state" = "carton", diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index ead07322184..dcb91024cc0 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -185,7 +185,7 @@ penetrates_skin = NONE var/fry_temperature = 450 //Around ~350 F (117 C) which deep fryers operate around in the real world chemical_flags = REAGENT_CAN_BE_SYNTHESIZED - default_container = /obj/item/reagent_containers/condiment/quality_oil + default_container = /obj/item/reagent_containers/condiment/cooking_oil /datum/reagent/consumable/cooking_oil/expose_obj(obj/exposed_obj, reac_volume) . = ..() @@ -530,6 +530,7 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "slime" chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + default_container = /obj/item/reagent_containers/condiment/cooking_oil /datum/reagent/consumable/cornoil/expose_turf(turf/open/exposed_turf, reac_volume) . = ..() diff --git a/code/modules/reagents/reagent_containers/condiment.dm b/code/modules/reagents/reagent_containers/condiment.dm index 0814b1364c9..170246d45d8 100644 --- a/code/modules/reagents/reagent_containers/condiment.dm +++ b/code/modules/reagents/reagent_containers/condiment.dm @@ -9,7 +9,7 @@ name = "condiment bottle" desc = "Just your average condiment bottle." icon = 'icons/obj/food/containers.dmi' - icon_state = "emptycondiment" + icon_state = "bottle" inhand_icon_state = "beer" //Generic held-item sprite until unique ones are made. lefthand_file = 'icons/mob/inhands/items/drinks_lefthand.dmi' righthand_file = 'icons/mob/inhands/items/drinks_righthand.dmi' @@ -273,6 +273,13 @@ list_reagents = list(/datum/reagent/consumable/vinegar = 50) fill_icon_thresholds = null +/obj/item/reagent_containers/condiment/cooking_oil + name = "cooking oil" + desc = "For all your deep-frying needs." + icon_state = "cooking_oil" + list_reagents = list(/datum/reagent/consumable/cooking_oil = 50) + fill_icon_thresholds = null + /obj/item/reagent_containers/condiment/quality_oil name = "quality oil" desc = "For the fancy chef inside everyone." diff --git a/icons/obj/food/containers.dmi b/icons/obj/food/containers.dmi index a5269f6462e..6d7792c9254 100644 Binary files a/icons/obj/food/containers.dmi and b/icons/obj/food/containers.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index 6f2564021d9..11f23391089 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ diff --git a/icons/ui_icons/condiments/bbqsauce.png b/icons/ui_icons/condiments/bbqsauce.png index 3ec5868b4cf..c934c2d60ed 100644 Binary files a/icons/ui_icons/condiments/bbqsauce.png and b/icons/ui_icons/condiments/bbqsauce.png differ diff --git a/icons/ui_icons/condiments/bottle.png b/icons/ui_icons/condiments/bottle.png new file mode 100644 index 00000000000..1a73419e727 Binary files /dev/null and b/icons/ui_icons/condiments/bottle.png differ diff --git a/icons/ui_icons/condiments/cherryjelly.png b/icons/ui_icons/condiments/cherryjelly.png index 3940c4e1cab..96ea15cb303 100644 Binary files a/icons/ui_icons/condiments/cherryjelly.png and b/icons/ui_icons/condiments/cherryjelly.png differ diff --git a/icons/ui_icons/condiments/coldsauce.png b/icons/ui_icons/condiments/coldsauce.png index a204ce150fa..1ba6af6847b 100644 Binary files a/icons/ui_icons/condiments/coldsauce.png and b/icons/ui_icons/condiments/coldsauce.png differ diff --git a/icons/ui_icons/condiments/cookingoil.png b/icons/ui_icons/condiments/cookingoil.png new file mode 100644 index 00000000000..dc8a192e401 Binary files /dev/null and b/icons/ui_icons/condiments/cookingoil.png differ diff --git a/icons/ui_icons/condiments/emptycondiment.png b/icons/ui_icons/condiments/emptycondiment.png deleted file mode 100644 index c34f2908736..00000000000 Binary files a/icons/ui_icons/condiments/emptycondiment.png and /dev/null differ diff --git a/icons/ui_icons/condiments/enzyme.png b/icons/ui_icons/condiments/enzyme.png index 2d20c564eeb..a72a83a5c6c 100644 Binary files a/icons/ui_icons/condiments/enzyme.png and b/icons/ui_icons/condiments/enzyme.png differ diff --git a/icons/ui_icons/condiments/flour.png b/icons/ui_icons/condiments/flour.png index 3b8447bf5e7..bcbb22db3fc 100644 Binary files a/icons/ui_icons/condiments/flour.png and b/icons/ui_icons/condiments/flour.png differ diff --git a/icons/ui_icons/condiments/honey.png b/icons/ui_icons/condiments/honey.png new file mode 100644 index 00000000000..7cf510d6f5b Binary files /dev/null and b/icons/ui_icons/condiments/honey.png differ diff --git a/icons/ui_icons/condiments/hotsauce.png b/icons/ui_icons/condiments/hotsauce.png index e217226570a..c243da054aa 100644 Binary files a/icons/ui_icons/condiments/hotsauce.png and b/icons/ui_icons/condiments/hotsauce.png differ diff --git a/icons/ui_icons/condiments/ketchup.png b/icons/ui_icons/condiments/ketchup.png index c9b8516ff8f..4896289ec23 100644 Binary files a/icons/ui_icons/condiments/ketchup.png and b/icons/ui_icons/condiments/ketchup.png differ diff --git a/icons/ui_icons/condiments/mayonnaise.png b/icons/ui_icons/condiments/mayonnaise.png index d9b44ee2c30..0d6301b8935 100644 Binary files a/icons/ui_icons/condiments/mayonnaise.png and b/icons/ui_icons/condiments/mayonnaise.png differ diff --git a/icons/ui_icons/condiments/milk.png b/icons/ui_icons/condiments/milk.png index b2d0bf97db8..e0c4cf03cc8 100644 Binary files a/icons/ui_icons/condiments/milk.png and b/icons/ui_icons/condiments/milk.png differ diff --git a/icons/ui_icons/condiments/oliveoil.png b/icons/ui_icons/condiments/oliveoil.png index 647608a7caf..ee1bea5bf9b 100644 Binary files a/icons/ui_icons/condiments/oliveoil.png and b/icons/ui_icons/condiments/oliveoil.png differ diff --git a/icons/ui_icons/condiments/peanutbutter.png b/icons/ui_icons/condiments/peanutbutter.png index dd751efaa3e..a9d048d5e9a 100644 Binary files a/icons/ui_icons/condiments/peanutbutter.png and b/icons/ui_icons/condiments/peanutbutter.png differ diff --git a/icons/ui_icons/condiments/peppermillsmall.png b/icons/ui_icons/condiments/peppermillsmall.png index 2473641a05c..8cd77e2ceeb 100644 Binary files a/icons/ui_icons/condiments/peppermillsmall.png and b/icons/ui_icons/condiments/peppermillsmall.png differ diff --git a/icons/ui_icons/condiments/rice.png b/icons/ui_icons/condiments/rice.png index 62ea6b7f3a7..b49fb842979 100644 Binary files a/icons/ui_icons/condiments/rice.png and b/icons/ui_icons/condiments/rice.png differ diff --git a/icons/ui_icons/condiments/saltshakersmall.png b/icons/ui_icons/condiments/saltshakersmall.png index d21e322239c..70b17e2cb55 100644 Binary files a/icons/ui_icons/condiments/saltshakersmall.png and b/icons/ui_icons/condiments/saltshakersmall.png differ diff --git a/icons/ui_icons/condiments/soymilk.png b/icons/ui_icons/condiments/soymilk.png index ecca184908d..1117e532fce 100644 Binary files a/icons/ui_icons/condiments/soymilk.png and b/icons/ui_icons/condiments/soymilk.png differ diff --git a/icons/ui_icons/condiments/soysauce.png b/icons/ui_icons/condiments/soysauce.png index 92b129447a2..aafb139f323 100644 Binary files a/icons/ui_icons/condiments/soysauce.png and b/icons/ui_icons/condiments/soysauce.png differ diff --git a/icons/ui_icons/condiments/sugar.png b/icons/ui_icons/condiments/sugar.png index d21788dc342..3cb1264ed35 100644 Binary files a/icons/ui_icons/condiments/sugar.png and b/icons/ui_icons/condiments/sugar.png differ