From b2fd3eae0acde11b2e1127a5da1ed804103165b3 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Thu, 3 Nov 2022 23:33:07 +0100 Subject: [PATCH] [MIRROR] Funny merge skew from banana [MDB IGNORE] (#17335) * Funny merge skew from banana (#71039) When a food feature PR and a food refactor come together, and get merged without re-running checks, something very funny happens. A merge skew. Edible component uses inherent component so this is fine. * Funny merge skew from banana Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/hydroponics/grown/banana.dm | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 161b693f344..601c51415ce 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -28,22 +28,9 @@ juice_results = list(/datum/reagent/consumable/banana = 0) distill_reagent = /datum/reagent/consumable/ethanol/bananahonk -///Override for checkliked callback /obj/item/food/grown/banana/MakeEdible() - AddComponent( - /datum/component/edible,\ - initial_reagents = food_reagents,\ - food_flags = food_flags,\ - foodtypes = foodtypes,\ - volume = max_volume,\ - eat_time = eat_time,\ - tastes = tastes,\ - eatverbs = eatverbs,\ - bite_consumption = bite_consumption,\ - microwaved_type = microwaved_type,\ - junkiness = junkiness,\ - check_liked = CALLBACK(src, .proc/check_liked),\ - ) + . = ..() + AddComponent(/datum/component/edible, check_liked = CALLBACK(src, .proc/check_liked)) /obj/item/food/grown/banana/Initialize(mapload) . = ..()