diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm
index ec9b6af8fa9..422bd29ba56 100644
--- a/code/game/objects/items/mixing_bowl.dm
+++ b/code/game/objects/items/mixing_bowl.dm
@@ -34,7 +34,7 @@
if(S.amount > 1)
new S.type (src)
S.use(1)
- user.visible_message("[user] has added one of [S] to [src].", "You add one of [S] to [src].")
+ user.visible_message("[user] adds one of [S] to [src].", "You add one of [S] to [src].")
else
return add_item(S, user)
else
@@ -56,7 +56,7 @@
//return 0
else
I.forceMove(src)
- user.visible_message("[user] has added [I] to [src].", "You add [I] to [src].")
+ user.visible_message("[user] adds [I] to [src].", "You add [I] to [src].")
/obj/item/mixing_bowl/attack_self(mob/user)
var/dat = ""
diff --git a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
index 41fc6613f31..d77e73a338f 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
@@ -32,24 +32,28 @@
..()
create_reagents(100)
reagents.set_reacting(FALSE)
+ init_lists()
+
+/obj/machinery/kitchen_machine/proc/init_lists()
if(!GLOB.cooking_recipes[recipe_type])
GLOB.cooking_recipes[recipe_type] = list()
GLOB.cooking_ingredients[recipe_type] = list()
GLOB.cooking_reagents[recipe_type] = list()
- for(var/type in subtypesof(GLOB.cooking_recipe_types[recipe_type]))
- var/datum/recipe/recipe = new type
- if(recipe in GLOB.cooking_recipes[recipe_type])
- qdel(recipe)
- continue
- if(recipe.result) // Ignore recipe subtypes that lack a result
- GLOB.cooking_recipes[recipe_type] += recipe
- for(var/item in recipe.items)
- GLOB.cooking_ingredients[recipe_type] |= item
- for(var/reagent in recipe.reagents)
- GLOB.cooking_reagents[recipe_type] |= reagent
- else
- qdel(recipe)
- GLOB.cooking_ingredients[recipe_type] |= /obj/item/reagent_containers/food/snacks/grown
+ if(!length(GLOB.cooking_recipes[recipe_type]))
+ for(var/type in subtypesof(GLOB.cooking_recipe_types[recipe_type]))
+ var/datum/recipe/recipe = new type
+ if(recipe in GLOB.cooking_recipes[recipe_type])
+ qdel(recipe)
+ continue
+ if(recipe.result) // Ignore recipe subtypes that lack a result
+ GLOB.cooking_recipes[recipe_type] += recipe
+ for(var/item in recipe.items)
+ GLOB.cooking_ingredients[recipe_type] |= item
+ for(var/reagent in recipe.reagents)
+ GLOB.cooking_reagents[recipe_type] |= reagent
+ else
+ qdel(recipe)
+ GLOB.cooking_ingredients[recipe_type] |= /obj/item/reagent_containers/food/snacks/grown
/*******************
* Item Adding
@@ -78,26 +82,14 @@
if(broken > 0)
if(broken == 2 && istype(O, /obj/item/screwdriver)) // If it's broken and they're using a screwdriver
- user.visible_message( \
- "[user] starts to fix part of \the [src].", \
- "You start to fix part of \the [src]." \
- )
+ user.visible_message("[user] starts to fix part of [src].", "You start to fix part of [src].")
if(do_after(user, 20 * O.toolspeed, target = src))
- user.visible_message( \
- "[user] fixes part of \the [src].", \
- "You have fixed part of \the [src]." \
- )
+ user.visible_message("[user] fixes part of [src].", "You have fixed part of \the [src].")
broken = 1 // Fix it a bit
else if(broken == 1 && istype(O, /obj/item/wrench)) // If it's broken and they're doing the wrench
- user.visible_message( \
- "[user] starts to fix part of \the [src].", \
- "You start to fix part of \the [src]." \
- )
+ user.visible_message("[user] starts to fix part of [src].", "You start to fix part of [src].")
if(do_after(user, 20 * O.toolspeed, target = src))
- user.visible_message( \
- "[user] fixes \the [src].", \
- "You have fixed \the [src]." \
- )
+ user.visible_message("[user] fixes [src].", "You have fixed [src].")
icon_state = off_icon
broken = 0 // Fix it!
dirty = 0 // just to be sure
@@ -107,15 +99,9 @@
return 1
else if(dirty==100) // The machine is all dirty so can't be used!
if(istype(O, /obj/item/reagent_containers/spray/cleaner) || istype(O, /obj/item/soap)) // If they're trying to clean it then let them
- user.visible_message( \
- "[user] starts to clean \the [src].", \
- "You start to clean \the [src]." \
- )
+ user.visible_message("[user] starts to clean [src].", "You start to clean [src].")
if(do_after(user, 20 * O.toolspeed, target = src))
- user.visible_message( \
- "[user] has cleaned [src].", \
- "You have cleaned [src]." \
- )
+ user.visible_message("[user] has cleaned [src].", "You have cleaned [src].")
dirty = 0 // It's clean!
broken = 0 // just to be sure
icon_state = off_icon
@@ -132,7 +118,7 @@
if(S.amount > 1)
new S.type (src)
S.use(1)
- user.visible_message("[user] has added one of [S] to [src].", "You add one of [S] to [src].")
+ user.visible_message("[user] adds one of [S] to [src].", "You add one of [S] to [src].")
else
add_item(S, user)
else
@@ -158,7 +144,7 @@
//return 0
else
I.forceMove(src)
- user.visible_message("[user] has added [I] to [src].", "You add [I] to [src].")
+ user.visible_message("[user] adds [I] to [src].", "You add [I] to [src].")
/obj/machinery/kitchen_machine/attack_ai(mob/user)
return 0