diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 3a6101b65c7..4a00f9726a9 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -49,6 +49,10 @@ name = "Snack bowl" icon_state = "snack_bowl" +/obj/item/trash/fried_vox + name = "Kentucky Fried Vox" + icon_state = "fried_vox_empty" + /obj/item/trash/pistachios name = "Pistachios pack" icon_state = "pistachios_pack" diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index b27b9b6ba21..991d81f443d 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -243,6 +243,14 @@ trash = null list_reagents = list("protein" = 6, "vitamin" = 2) tastes = list("meat" = 1) + +/obj/item/reagent_containers/food/snacks/fried_vox + name = "Kentucky Fried Vox" + desc = "Bucket of voxxy, yaya!" + icon_state = "fried_vox" + trash = /obj/item/trash/fried_vox + list_reagents = list("nutriment" = 3, "protein" = 5) + tastes = list("quills" = 1, "the shoal" = 1) ////////////////////// // Cubes // diff --git a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm index eb2e8bd3e7b..1ac3dd14dd2 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/cooker.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/cooker.dm @@ -43,6 +43,8 @@ return 1 if(istype(check, /obj/item/grab)) return special_attack(check, user) + if(has_specials && checkSpecials(check)) + return TRUE to_chat(user, "You can only process food!") return 0 diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 6f6d9132fdf..7cab43b14c1 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -70,7 +70,7 @@ return 0 for(var/Type in subtypesof(/datum/deepfryer_special)) var/datum/deepfryer_special/P = new Type() - if(!istype(I, P.input)) + if(!P.validate(I)) continue return P return 0 @@ -83,7 +83,6 @@ return 0 new recipe.output(get_turf(src)) - ////////////////////////////////// // Deepfryer Special // // Interaction Datums // @@ -93,6 +92,9 @@ var/input //Thing that goes in var/output //Thing that comes out +/datum/deepfryer_special/proc/validate(obj/item/I) + return istype(I, input) + /datum/deepfryer_special/shrimp input = /obj/item/reagent_containers/food/snacks/shrimp output = /obj/item/reagent_containers/food/snacks/fried_shrimp @@ -123,4 +125,14 @@ /datum/deepfryer_special/carrotfries input = /obj/item/reagent_containers/food/snacks/grown/carrot/wedges - output = /obj/item/reagent_containers/food/snacks/carrotfries \ No newline at end of file + output = /obj/item/reagent_containers/food/snacks/carrotfries + +/datum/deepfryer_special/fried_vox + input = /obj/item/organ/external + output = /obj/item/reagent_containers/food/snacks/fried_vox + +/datum/deepfryer_special/fried_vox/validate(var/obj/item/I) + if(!..()) + return FALSE + var/obj/item/organ/external/E = I + return istype(E.dna.species, /datum/species/vox) \ No newline at end of file diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi index 87f4688dadb..3d02cfd7a58 100644 Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi index dde1156d295..265230ad369 100644 Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi index aea237f5bed..01295525b15 100644 Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ diff --git a/icons/obj/trash.dmi b/icons/obj/trash.dmi index 6edd905c554..5fa2372fa80 100644 Binary files a/icons/obj/trash.dmi and b/icons/obj/trash.dmi differ