From 8f9bb4cdc3d9059e1fcf82d524d7c3bc2a55202b Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 13 Mar 2017 14:14:49 -0400 Subject: [PATCH 1/2] Find/replace job for bread slices `/obj/item/weapon/reagent_containers/food/snacks/breadslice` is not a real thing. The only reason the code compiled with references to it is because there was a line at the top of sandwich.dm that defined the attackby proc for it, which willed it into existence with all the default 'snack' values so it was just called 'snack', had no icon, etc. `/obj/item/weapon/reagent_containers/food/snacks/slice/bread` is the real path for bread slices, and this replaces all mentions of one with the other. --- code/modules/food/recipes_microwave.dm | 24 +++++++++---------- .../reagent_containers/food/sandwich.dm | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm index 611a6112962..3d63261a959 100644 --- a/code/modules/food/recipes_microwave.dm +++ b/code/modules/food/recipes_microwave.dm @@ -621,8 +621,8 @@ I said no! /datum/recipe/sandwich items = list( /obj/item/weapon/reagent_containers/food/snacks/meatsteak, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/weapon/reagent_containers/food/snacks/sandwich @@ -635,8 +635,8 @@ I said no! /datum/recipe/grilledcheese items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, /obj/item/weapon/reagent_containers/food/snacks/cheesewedge, ) result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese @@ -663,14 +663,14 @@ I said no! /datum/recipe/slimetoast reagents = list("slimejelly" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, ) result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/slime /datum/recipe/jelliedtoast reagents = list("cherryjelly" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, ) result = /obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry @@ -783,24 +783,24 @@ I said no! /datum/recipe/twobread reagents = list("wine" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, ) result = /obj/item/weapon/reagent_containers/food/snacks/twobread /datum/recipe/slimesandwich reagents = list("slimejelly" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, ) result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/slime /datum/recipe/cherrysandwich reagents = list("cherryjelly" = 5) items = list( - /obj/item/weapon/reagent_containers/food/snacks/breadslice, - /obj/item/weapon/reagent_containers/food/snacks/breadslice, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, + /obj/item/weapon/reagent_containers/food/snacks/slice/bread, ) result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry diff --git a/code/modules/reagents/reagent_containers/food/sandwich.dm b/code/modules/reagents/reagent_containers/food/sandwich.dm index 48356172ca0..f2b783f90f5 100644 --- a/code/modules/reagents/reagent_containers/food/sandwich.dm +++ b/code/modules/reagents/reagent_containers/food/sandwich.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/W as obj, mob/user as mob) +/obj/item/weapon/reagent_containers/food/snacks/slice/bread/attackby(obj/item/W as obj, mob/user as mob) if(istype(W,/obj/item/weapon/material/shard) || istype(W,/obj/item/weapon/reagent_containers/food/snacks)) var/obj/item/weapon/reagent_containers/food/snacks/csandwich/S = new(get_turf(src)) @@ -19,7 +19,7 @@ var/sandwich_limit = 4 for(var/obj/item/O in ingredients) - if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/breadslice)) + if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/slice/bread)) sandwich_limit += 4 if(istype(W,/obj/item/weapon/material/shard)) From e2c4064f49d865b79cfc800c128e7bbb87852497 Mon Sep 17 00:00:00 2001 From: Arokha Sieyes Date: Mon, 13 Mar 2017 14:15:04 -0400 Subject: [PATCH 2/2] VR-specific fixes for this --- .../reagents/reagent_containers/food/z_custom_food_vr.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/reagents/reagent_containers/food/z_custom_food_vr.dm b/code/modules/reagents/reagent_containers/food/z_custom_food_vr.dm index eeeb9896ef9..91a5f6848ef 100644 --- a/code/modules/reagents/reagent_containers/food/z_custom_food_vr.dm +++ b/code/modules/reagents/reagent_containers/food/z_custom_food_vr.dm @@ -140,7 +140,7 @@ var/global/ingredientLimit = 20 addTop = 0 /obj/item/weapon/reagent_containers/food/snacks/customizable/sandwich/attackby(obj/item/I,mob/user) - if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/breadslice) && !addTop) + if(istype(I,/obj/item/weapon/reagent_containers/food/snacks/slice/bread) && !addTop) I.reagents.trans_to(src,I.reagents.total_volume) qdel(I) addTop = 1 @@ -182,7 +182,7 @@ var/global/ingredientLimit = 20 // Various Snacks ////////////////////////////////////////////// -/obj/item/weapon/reagent_containers/food/snacks/breadslice/attackby(obj/item/I,mob/user,params) +/obj/item/weapon/reagent_containers/food/snacks/slice/bread/attackby(obj/item/I,mob/user,params) if(istype(I,/obj/item/weapon/reagent_containers/food/snacks)) if(!recursiveFood && istype(I, /obj/item/weapon/reagent_containers/food/snacks/customizable)) to_chat(user, "Sorry, no recursive food.")