From e18153d507a301272f0159e7af81fac8b759a235 Mon Sep 17 00:00:00 2001 From: YakumoChen Date: Thu, 18 Jan 2024 17:05:30 +0000 Subject: [PATCH] GORE foodtype for fishman/birdman meat, ports birdman meat, adds birdman burger (#26135) * better meat types for bird/akula crew * add to dme * chicken man burger recipe * it lives * Update birdman_food.dm * Update SRseafood.dm * Update SRseafood.dm --- .../modules/better_vox/code/vox_species.dm | 1 + .../modules/food_and_drinks/food/SRseafood.dm | 3 + .../mob/living/carbon/human/species/vox.dm | 2 +- .../modules/teshari/code/_teshari.dm | 3 +- .../modules/teshari/code/birdman_food.dm | 107 ++++++++++++++++++ tgstation.dme | 1 + 6 files changed, 114 insertions(+), 3 deletions(-) create mode 100644 modular_skyrat/modules/teshari/code/birdman_food.dm diff --git a/modular_skyrat/modules/better_vox/code/vox_species.dm b/modular_skyrat/modules/better_vox/code/vox_species.dm index a8c2d4c0e2e..0a48e4881ba 100644 --- a/modular_skyrat/modules/better_vox/code/vox_species.dm +++ b/modular_skyrat/modules/better_vox/code/vox_species.dm @@ -16,6 +16,7 @@ mutantbrain = /obj/item/organ/internal/brain/vox breathid = "n2" mutant_bodyparts = list() + meat = /obj/item/food/meat/slab/chicken/human //item file in teshari module mutanttongue = /obj/item/organ/internal/tongue/vox payday_modifier = 1.0 outfit_important_for_life = /datum/outfit/vox diff --git a/modular_skyrat/modules/customization/modules/food_and_drinks/food/SRseafood.dm b/modular_skyrat/modules/customization/modules/food_and_drinks/food/SRseafood.dm index 870298af08a..6fac651fde7 100644 --- a/modular_skyrat/modules/customization/modules/food_and_drinks/food/SRseafood.dm +++ b/modular_skyrat/modules/customization/modules/food_and_drinks/food/SRseafood.dm @@ -20,3 +20,6 @@ /obj/item/food/fishmeat/moonfish/akula name = "aquatic fillet" desc = "A fillet of a rather large fish..." + tastes = list("tender fish" = 1) + foodtypes = SEAFOOD | GORE + venue_value = FOOD_MEAT_HUMAN diff --git a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm index bb7f7bd4ae7..1443559caf2 100644 --- a/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm +++ b/modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/vox.dm @@ -45,7 +45,7 @@ LOADOUT_ITEM_EARS = VOX_EARS_ICON ) - meat = /obj/item/food/meat/slab/chicken + meat = /obj/item/food/meat/slab/chicken/human //item file in teshari module /datum/species/vox/get_default_mutant_bodyparts() return list( diff --git a/modular_skyrat/modules/teshari/code/_teshari.dm b/modular_skyrat/modules/teshari/code/_teshari.dm index 07e832bfb41..3a7b8e0ee79 100644 --- a/modular_skyrat/modules/teshari/code/_teshari.dm +++ b/modular_skyrat/modules/teshari/code/_teshari.dm @@ -47,8 +47,7 @@ BODY_ZONE_L_LEG = /obj/item/bodypart/leg/left/mutant/teshari, BODY_ZONE_R_LEG = /obj/item/bodypart/leg/right/mutant/teshari, ) - - meat = /obj/item/food/meat/slab/chicken + meat = /obj/item/food/meat/slab/chicken/human /datum/species/teshari/get_default_mutant_bodyparts() return list( diff --git a/modular_skyrat/modules/teshari/code/birdman_food.dm b/modular_skyrat/modules/teshari/code/birdman_food.dm new file mode 100644 index 00000000000..aba9342a0a5 --- /dev/null +++ b/modular_skyrat/modules/teshari/code/birdman_food.dm @@ -0,0 +1,107 @@ +/obj/item/food/meat/slab/chicken/human + name = "meat" + tastes = list("tender meat" = 1) + foodtypes = MEAT | RAW | GORE + venue_value = FOOD_MEAT_HUMAN + +/obj/item/food/meat/slab/chicken/human/make_grillable() + AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/chicken/human, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE) + +/obj/item/food/meat/steak/chicken/human/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency = 1) + . = ..() + if(!istype(source_item, /obj/item/food/meat)) + return + + var/obj/item/food/meat/origin_meat = source_item + subjectname = origin_meat.subjectname + subjectjob = origin_meat.subjectjob + if(subjectname) + name = "[origin_meat.subjectname] meatsteak" + else if(subjectjob) + name = "[origin_meat.subjectjob] meatsteak" + +/obj/item/food/meat/slab/chicken/human/make_processable() + AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken/human, 3, 3 SECONDS, table_required = TRUE, screentip_verb = "Cut") + +/obj/item/food/meat/steak/chicken/human + tastes = list("tender meat" = 1) + foodtypes = MEAT | GORE + +/obj/item/food/meat/rawcutlet/chicken/human + tastes = list("tender meat" = 1) + foodtypes = MEAT | RAW | GORE + +/obj/item/food/meat/cutlet/chicken/human + tastes = list("tender meat" = 1) + foodtypes = MEAT | GORE + +/obj/item/food/meat/cutlet/chicken/human/on_microwave_cooked(datum/source, atom/source_item, cooking_efficiency) + . = ..() + if(!istype(source_item, /obj/item/food/meat)) + return + + var/obj/item/food/meat/origin_meat = source_item + if(subjectname) + name = "[origin_meat.subjectname] [initial(name)]" + else if(subjectjob) + name = "[origin_meat.subjectjob] [initial(name)]" + +/obj/item/food/raw_meatball/chicken/human + name = "strange raw chicken meatball" + meatball_type = /obj/item/food/meatball/chicken/human + patty_type = /obj/item/food/raw_patty/chicken/human + +/obj/item/food/meatball/chicken/human + name = "strange chicken meatball" + +/obj/item/food/raw_patty/chicken/human + name = "strange raw chicken patty" + patty_type = /obj/item/food/patty/human/chicken + +/obj/item/food/patty/human/chicken + name = "strange chicken patty" + tastes = list("chikun" = 1) + icon_state = "chicken_patty" + +/datum/food_processor_process/meat/chicken + blacklist = list(/obj/item/food/meat/slab/chicken) + +/datum/food_processor_process/meat/chicken/human + input = /obj/item/food/meat/slab/chicken/human + output = /obj/item/food/raw_meatball/chicken/human + blacklist = null + +/obj/item/food/burger/human/chicken + name = "birdman sandwich" + desc = "You're pretty sure this sandwich doesn't fund a good cause..." + icon_state = "chickenburger" + food_reagents = list( + /datum/reagent/consumable/nutriment = 3, + /datum/reagent/consumable/mayonnaise = 3, + /datum/reagent/consumable/nutriment/protein = 7, + /datum/reagent/consumable/nutriment/vitamin = 1, + /datum/reagent/consumable/nutriment/fat/oil = 2, + ) + tastes = list("bun" = 2, "chikun" = 4, "Against God and Nature" = 1) + foodtypes = GRAIN | MEAT | FRIED | GORE + crafting_complexity = FOOD_COMPLEXITY_3 + venue_value = FOOD_PRICE_CHEAP + +/obj/item/food/burger/human/chicken/CheckParts(list/parts_list) + ..() + var/obj/item/food/patty/human/human_patty = locate(/obj/item/food/patty/human/chicken) in contents + for(var/datum/material/meat/mob_meat/mob_meat_material in human_patty.custom_materials) + if(mob_meat_material.subjectname) + name = "[mob_meat_material.subjectname] burger" + else if(mob_meat_material.subjectjob) + name = "[mob_meat_material.subjectjob] burger" + +/datum/crafting_recipe/food/chickenburger/human + name = "Birdman Sandwich" + reqs = list( + /obj/item/food/patty/human/chicken = 1, + /datum/reagent/consumable/mayonnaise = 5, + /obj/item/food/bun = 1 + ) + result = /obj/item/food/burger/human/chicken + category = CAT_BURGER diff --git a/tgstation.dme b/tgstation.dme index 434e9218ee6..2dd7b322b2f 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8015,6 +8015,7 @@ #include "modular_skyrat\modules\tarkon\code\misc-fluff\tools.dm" #include "modular_skyrat\modules\teshari\code\_clothing_defines.dm" #include "modular_skyrat\modules\teshari\code\_teshari.dm" +#include "modular_skyrat\modules\teshari\code\birdman_food.dm" #include "modular_skyrat\modules\teshari\code\language_holder.dm" #include "modular_skyrat\modules\teshari\code\schechi.dm" #include "modular_skyrat\modules\teshari\code\teshari_bodytype.dm"