diff --git a/code/datums/components/food/edible.dm b/code/datums/components/food/edible.dm index d7c40971380..54aed42db87 100644 --- a/code/datums/components/food/edible.dm +++ b/code/datums/components/food/edible.dm @@ -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 diff --git a/code/datums/materials/meat.dm b/code/datums/materials/meat.dm index 281082fe350..c020eafe9f7 100644 --- a/code/datums/materials/meat.dm +++ b/code/datums/materials/meat.dm @@ -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 diff --git a/code/game/machinery/sheetifier.dm b/code/game/machinery/sheetifier.dm index 7083da0239a..e191e6115b2 100644 --- a/code/game/machinery/sheetifier.dm +++ b/code/game/machinery/sheetifier.dm @@ -13,8 +13,7 @@ /obj/machinery/sheetifier/Initialize() . = ..() - - //AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials)) - SKYRAT EDIT REMOVAL + AddComponent(/datum/component/material_container, list(/datum/material/meat, /datum/material/hauntium), MINERAL_MATERIAL_AMOUNT * MAX_STACK_SIZE * 2, MATCONTAINER_EXAMINE|BREAKDOWN_FLAGS_SHEETIFIER, typesof(/datum/material/meat) + /datum/material/hauntium, list(/obj/item/food/meat, /obj/item/photo), null, CALLBACK(src, .proc/CanInsertMaterials), CALLBACK(src, .proc/AfterInsertMaterials)) /obj/machinery/sheetifier/update_overlays() . = ..() diff --git a/code/game/objects/items/food/meat.dm b/code/game/objects/items/food/meat.dm index 954ab97476b..42f8ed1113f 100644 --- a/code/game/objects/items/food/meat.dm +++ b/code/game/objects/items/food/meat.dm @@ -605,8 +605,7 @@ food_reagents = list(/datum/reagent/consumable/nutriment/protein = 12, /datum/reagent/consumable/nutriment/vitamin = 6, /datum/reagent/consumable/capsaicin = 3) /obj/item/food/meat - //custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4) //SKYRAT EDIT REMOVAL - material_flags = MATERIAL_NO_EFFECTS + custom_materials = list(/datum/material/meat = MINERAL_MATERIAL_AMOUNT * 4) var/subjectname = "" var/subjectjob = null w_class = WEIGHT_CLASS_SMALL @@ -957,7 +956,6 @@ desc = "A piece of hot spicy meat." icon_state = "meatsteak" food_reagents = list(/datum/reagent/consumable/nutriment/protein = 8, /datum/reagent/consumable/nutriment/vitamin = 1) - foodtypes = MEAT tastes = list("meat" = 1) burns_on_grill = TRUE diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 866e4df27fd..a8adb798032 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -727,8 +727,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra /obj/item/stack/sheet/paperframes/fifty amount = 50 -//SKYRAT EDIT REMOVAL BEGIN -/* /obj/item/stack/sheet/meat name = "meat sheets" desc = "Something's bloody meat compressed into a nice solid sheet." @@ -746,8 +744,6 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra amount = 20 /obj/item/stack/sheet/meat/five amount = 5 -*/ -//SKYRAT EDIT REMOVAL END //SKYRAT EDIT REMOVAL BEGIN /* diff --git a/code/modules/cargo/exports/sheets.dm b/code/modules/cargo/exports/sheets.dm index 37d23bb3064..33714ee7525 100644 --- a/code/modules/cargo/exports/sheets.dm +++ b/code/modules/cargo/exports/sheets.dm @@ -118,14 +118,13 @@ cost = CARGO_CRATE_VALUE * 0.06 unit_name = "of sheetza" export_types = list(/obj/item/stack/sheet/pizza) +*/ +//SKYRAT EDIT REMOVAL END /datum/export/stack/meat cost = CARGO_CRATE_VALUE * 0.04 unit_name = "of meat" export_types = list(/obj/item/stack/sheet/meat) -*/ -//SKYRAT EDIT REMOVAL END - // Weird Stuff