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

[MIRROR] Cooked steaks are once again edible. (#6577)

Browse Source 
* Cooked steaks are once again edible.

* FF

* Update sheetifier.dm

Co-authored-by: Timberpoes <silent_insomnia_pp@hotmail.co.uk>
Co-authored-by: Gandalf <jzo123@hotmail.com>
This commit is contained in:
SkyratBot
2021-06-29 17:56:25 +02:00
committed by GitHub
parent ed6d1eef10
commit a110c0a342
6 changed files with 27 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/food/edible.dm
+23 -19
View File
@@ -45,20 +45,21 @@ Behavior that's still missing from this component that original food items had t
///The type of atom this creates when the object is microwaved.
var/atom/microwaved_type
/datum/component/edible/Initialize(list/initial_reagents,
food_flags = NONE,
foodtypes = NONE,
volume = 50,
eat_time = 10,
list/tastes,
list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
bite_consumption = 2,
microwaved_type,
junkiness,
datum/callback/after_eat,
datum/callback/on_consume,
datum/callback/check_liked)
/datum/component/edible/Initialize(
list/initial_reagents,
food_flags = NONE,
foodtypes = NONE,
volume = 50,
eat_time = 10,
list/tastes,
list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
bite_consumption = 2,
microwaved_type,
junkiness,
datum/callback/after_eat,
datum/callback/on_consume,
datum/callback/check_liked,
)
if(!isatom(parent))
return COMPONENT_INCOMPATIBLE
@@ -111,20 +112,23 @@ Behavior that's still missing from this component that original food items had t
else
owner.reagents.add_reagent(rid, amount)
/datum/component/edible/InheritComponent(datum/component/C,
/datum/component/edible/InheritComponent(
datum/component/C,
i_am_original,
list/initial_reagents,
food_flags = NONE,
foodtypes = NONE,
volume = 50,
eat_time = 30,
eat_time = 10,
list/tastes,
list/eatverbs = list("bite","chew","nibble","gnaw","gobble","chomp"),
bite_consumption = 2,
microwaved_type,
junkiness,
datum/callback/after_eat,
datum/callback/on_consume
)
datum/callback/on_consume,
datum/callback/check_liked,
)
. = ..()
src.bite_consumption = bite_consumption
src.food_flags = food_flags
code/datums/materials/meat.dm
-5
View File
@@ -1,5 +1,3 @@
//SKYRAT EDIT REMOVAL BEGIN
/*
///It's gross, gets the name of it's owner, and is all kinds of fucked up
/datum/material/meat
name = "meat"
@@ -33,9 +31,6 @@
var/nutriment_count = 3 * (amount / MINERAL_MATERIAL_AMOUNT)
var/oil_count = 2 * (amount / MINERAL_MATERIAL_AMOUNT)
source.AddComponent(/datum/component/edible, list(/datum/reagent/consumable/nutriment = nutriment_count, /datum/reagent/consumable/cooking_oil = oil_count), null, RAW | MEAT | GROSS, null, 30, list("Fleshy"))
*/
//SKYRAT EDIT REMOVAL END
/datum/material/meat/mob_meat
init_flags = MATERIAL_INIT_BESPOKE