cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-28 07:38:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Funny merge skew from banana [MDB IGNORE] (#17335)

Browse Source 
* 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>
This commit is contained in:
SkyratBot
2022-11-03 18:33:07 -04:00
committed by GitHub
co-authored by MrMelbert
parent f740a65f97
commit b2fd3eae0a
1 changed files with 2 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/grown/banana.dm
+2 -15
View File
@@ -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)
. = ..()