From 92e78f1cac860e634bf0f892bc76830cd43fcebc Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Fri, 6 Jan 2017 22:14:13 -0500 Subject: [PATCH] fixes --- code/game/machinery/vending.dm | 2 +- code/modules/food_and_drinks/food/candy.dm | 13 ++++++++----- .../food_and_drinks/recipes/recipes_candy.dm | 10 +++++----- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 86e58e6be5a..90436f2db76 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -798,7 +798,7 @@ products = list(/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein = 6, /obj/item/weapon/reagent_containers/food/snacks/chinese/tao = 6, /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 6, /obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 6) prices = list(/obj/item/weapon/reagent_containers/food/snacks/chinese/chowmein = 50, /obj/item/weapon/reagent_containers/food/snacks/chinese/tao = 50, /obj/item/weapon/reagent_containers/food/snacks/chinese/newdles = 50, - /obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 50, /obj/item/weapon/reagent_containers/food/snacks/wingfangchu = 50) + /obj/item/weapon/reagent_containers/food/snacks/chinese/rice = 50) /obj/machinery/vending/cola name = "\improper Robust Softdrinks" diff --git a/code/modules/food_and_drinks/food/candy.dm b/code/modules/food_and_drinks/food/candy.dm index de04e1ea1d1..d0d6ab4b32d 100644 --- a/code/modules/food_and_drinks/food/candy.dm +++ b/code/modules/food_and_drinks/food/candy.dm @@ -505,32 +505,35 @@ // Candybar Flavors // *********************************************************** -/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/rice +/obj/item/weapon/reagent_containers/food/snacks/candy/confectionery + list_reagents = list("nutriment" = 1, "chocolate" = 1) + +/obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/rice name = "Asteroid Crunch Bar" desc = "Crunchy rice deposits in delicious chocolate! A favorite of miners galaxy-wide." icon_state = "asteroidcrunch" trash = /obj/item/trash/candy filling_color = "#7D5F46" -/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/toffee +/obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/toffee name = "Yum-baton Bar" desc = "Chocolate and toffee in the shape of a baton. Security sure knows how to pound these down!" icon_state = "yumbaton" filling_color = "#7D5F46" -/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel +/obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/caramel name = "Malper Bar" desc = "A chocolate syringe filled with a caramel injection. Just what the doctor ordered!" icon_state = "malper" filling_color = "#7D5F46" -/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel_nougat +/obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/caramel_nougat name = "Toxins Test Bar" desc = "An explosive combination of chocolate, caramel, and nougat. Research has never been so tasty!" icon_state = "toxinstest" filling_color = "#7D5F46" -/obj/item/weapon/reagent_containers/food/snacks/candy/candybar/nougat +/obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/nougat name = "Tool-erone Bar" desc = "Chocolate-covered nougat, shaped like a wrench. Great for an engineer on the go!" icon_state = "toolerone" diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm index 98f969a17ec..414eee38354 100644 --- a/code/modules/food_and_drinks/recipes/recipes_candy.dm +++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm @@ -505,7 +505,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/candybar, /obj/item/weapon/reagent_containers/food/snacks/candy/caramel, ) - result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel + result = /obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/caramel /datum/recipe/candy/toolerone reagents = list() @@ -513,7 +513,7 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/candybar, /obj/item/weapon/reagent_containers/food/snacks/candy/nougat, ) - result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/nougat + result = /obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/nougat /datum/recipe/candy/yumbaton reagents = list() @@ -521,14 +521,14 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/candybar, /obj/item/weapon/reagent_containers/food/snacks/candy/toffee, ) - result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/toffee + result = /obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/toffee /datum/recipe/candy/crunch reagents = list("rice" = 5) items = list( /obj/item/weapon/reagent_containers/food/snacks/candy/candybar, ) - result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/rice + result = /obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/rice /datum/recipe/candy/toxinstest reagents = list() @@ -537,4 +537,4 @@ /obj/item/weapon/reagent_containers/food/snacks/candy/caramel, /obj/item/weapon/reagent_containers/food/snacks/candy/nougat, ) - result = /obj/item/weapon/reagent_containers/food/snacks/candy/candybar/caramel_nougat + result = /obj/item/weapon/reagent_containers/food/snacks/candy/confectionery/caramel_nougat