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

[MIRROR] Converts all* of the times in the food files into SECONDS [MDB IGNORE] (#14525)

Browse Source 
* Converts all* of the times in the food files into SECONDS

* Update code/game/objects/items/food/pie.dm

Co-authored-by: Paxilmaniac <82386923+Paxilmaniac@users.noreply.github.com>
Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
This commit is contained in:
SkyratBot
2022-06-28 02:28:52 +01:00
committed by GitHub
co-authored by Paxilmaniac Tom
parent dcf4c32969
commit e045f41480
10 changed files with 79 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/elements/food/processable.dm
+1 -1
View File
@@ -13,7 +13,7 @@
///Whether or not the atom being processed has to be on a table or tray to process it
var/table_required
/datum/element/processable/Attach(datum/target, tool_behaviour, result_atom_type, amount_created = 3, time_to_process = 20, table_required = FALSE)
/datum/element/processable/Attach(datum/target, tool_behaviour, result_atom_type, amount_created = 3, time_to_process = 2 SECONDS, table_required = FALSE)
. = ..()
if(!isatom(target))
return ELEMENT_INCOMPATIBLE
code/game/objects/items/food/bread.dm
+11 -11
View File
@@ -38,7 +38,7 @@
AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/bread/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8)
/obj/item/food/bread/plain/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/plain, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/plain, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/plain
name = "bread slice"
@@ -85,7 +85,7 @@
/obj/item/food/bread/meat/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/meat, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/meat, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/meat
name = "meatbread slice"
@@ -103,7 +103,7 @@
tastes = list("bread" = 10, "meat" = 10)
/obj/item/food/bread/sausage/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/sausage, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/sausage, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/sausage
name = "sausagebread slice"
@@ -122,7 +122,7 @@
foodtypes = GRAIN | MEAT
/obj/item/food/bread/xenomeat/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/xenomeat, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/xenomeat, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/xenomeat
name = "xenomeatbread slice"
@@ -140,7 +140,7 @@
foodtypes = GRAIN | MEAT | TOXIC
/obj/item/food/bread/spidermeat/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/spidermeat, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/spidermeat, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/spidermeat
name = "spider meat bread slice"
@@ -158,7 +158,7 @@
foodtypes = GRAIN | FRUIT
/obj/item/food/bread/banana/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/banana, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/banana, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/banana
name = "banana-nut bread slice"
@@ -177,7 +177,7 @@
venue_value = FOOD_PRICE_TRASH
/obj/item/food/bread/tofu/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/tofu, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/tofu, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/tofu
name = "tofubread slice"
@@ -195,7 +195,7 @@
foodtypes = GRAIN | DAIRY
/obj/item/food/bread/creamcheese/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/creamcheese, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/creamcheese, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/creamcheese
name = "cream cheese bread slice"
@@ -209,7 +209,7 @@
desc = "It's bread, customized to your wildest dreams."
/obj/item/food/bread/empty/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/empty, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/empty, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/bread/mimana
name = "mimana bread"
@@ -220,7 +220,7 @@
foodtypes = GRAIN | FRUIT
/obj/item/food/bread/mimana/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/mimana, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/mimana, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/mimana
name = "mimana bread slice"
@@ -293,7 +293,7 @@
/obj/item/food/butterdog/ComponentInitialize()
. = ..()
AddComponent(/datum/component/slippery, 80)
AddComponent(/datum/component/slippery, 8 SECONDS)
/obj/item/food/raw_frenchtoast
name = "raw french toast"
code/game/objects/items/food/cake.dm
+24 -24
View File
@@ -28,7 +28,7 @@
/obj/item/food/cake/plain/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/plain, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/plain, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/plain
name = "plain cake slice"
@@ -48,7 +48,7 @@
/obj/item/food/cake/carrot/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/carrot, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/carrot, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/carrot
name = "carrot cake slice"
@@ -67,7 +67,7 @@
foodtypes = GRAIN | DAIRY | MEAT | GROSS | SUGAR
/obj/item/food/cake/brain/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/brain, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/brain, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/brain
name = "brain cake slice"
@@ -88,7 +88,7 @@
/obj/item/food/cake/cheese/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/cheese, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/cheese, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/cheese
name = "cheese cake slice"
@@ -108,7 +108,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/orange/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/orange, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/orange, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/orange
name = "orange cake slice"
@@ -127,7 +127,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/lime/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/lime, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/lime, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/lime
name = "lime cake slice"
@@ -146,7 +146,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/lemon/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/lemon, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/lemon, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/lemon
name = "lemon cake slice"
@@ -165,7 +165,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/chocolate/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/chocolate, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/chocolate, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/chocolate
name = "chocolate cake slice"
@@ -183,7 +183,7 @@
foodtypes = GRAIN | DAIRY | JUNKFOOD | SUGAR
/obj/item/food/cake/birthday/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/birthday, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/birthday, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cake/birthday/microwave_act(obj/machinery/microwave/microwave) //super sekrit club
new /obj/item/clothing/head/hardhat/cakehat(get_turf(src))
@@ -207,7 +207,7 @@
tastes = list("cake" = 3, "a Vlad's Salad" = 1)
/obj/item/food/cake/birthday/energy/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/birthday/energy, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/birthday/energy, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cake/birthday/energy/proc/energy_bite(mob/living/user)
to_chat(user, "<font color='red' size='5'>As you eat the cake, you accidentally hurt yourself on the embedded energy sword!</font>")
@@ -255,7 +255,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/apple/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/apple, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/apple, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/apple
name = "apple cake slice"
@@ -273,7 +273,7 @@
foodtypes = GRAIN | DAIRY | SUGAR
/obj/item/food/cake/slimecake/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/slimecake, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/slimecake, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/slimecake
name = "slime cake slice"
@@ -292,7 +292,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/pumpkinspice/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pumpkinspice, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pumpkinspice, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/pumpkinspice
name = "pumpkin spice cake slice"
@@ -310,7 +310,7 @@
foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/food/cake/bsvc/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/bsvc, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/bsvc, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/bsvc
name = "blackberry and strawberry vanilla cake slice"
@@ -328,7 +328,7 @@
foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/food/cake/bscc/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/bscc, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/bscc, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/bscc
name = "strawberry chocolate cake slice"
@@ -346,7 +346,7 @@
foodtypes = GRAIN | DAIRY | SUGAR
/obj/item/food/cake/holy_cake/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/holy_cake_slice, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/holy_cake_slice, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/holy_cake_slice
name = "angel food cake slice"
@@ -365,7 +365,7 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/cake/pound_cake/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pound_cake_slice, 7, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pound_cake_slice, 7, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/pound_cake_slice
name = "pound cake slice"
@@ -384,7 +384,7 @@
foodtypes = GRAIN | GROSS
/obj/item/food/cake/hardware_cake/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/hardware_cake_slice, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/hardware_cake_slice, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/hardware_cake_slice
name = "hardware cake slice"
@@ -403,7 +403,7 @@
foodtypes = GRAIN | SUGAR | DAIRY
/obj/item/food/cake/vanilla_cake/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/vanilla_slice, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/vanilla_slice, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/vanilla_slice
name = "vanilla cake slice"
@@ -422,7 +422,7 @@
foodtypes = GRAIN | SUGAR | DAIRY
/obj/item/food/cake/clown_cake/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/clown_slice, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/clown_slice, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/clown_slice
name = "clown cake slice"
@@ -441,7 +441,7 @@
foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/food/cake/trumpet/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/trumpet, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/trumpet, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/trumpet
name = "spaceman's cake"
@@ -460,7 +460,7 @@
foodtypes = GRAIN | DAIRY | SUGAR
/obj/item/food/cake/brioche/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/brioche, 6, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/brioche, 6, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/brioche
name = "brioche cake slice"
@@ -479,7 +479,7 @@
foodtypes = DAIRY | FRUIT | SUGAR
/obj/item/food/cake/pavlova/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlova, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/pavlova, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/pavlova
name = "pavlova slice"
@@ -502,7 +502,7 @@
foodtypes = GRAIN | DAIRY | FRUIT | SUGAR
/obj/item/food/cake/fruit/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/fruit, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/fruit, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/fruit
name = "english fruitcake slice"
code/game/objects/items/food/cheese.dm
+2 -2
View File
@@ -41,7 +41,7 @@
AddComponent(/datum/component/food_storage)
/obj/item/food/cheese/wheel/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/wedge, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/wedge, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cheese/wheel/MakeBakeable()
AddComponent(/datum/component/bakeable, /obj/item/food/baked_cheese, rand(20 SECONDS, 25 SECONDS), TRUE, TRUE)
@@ -93,7 +93,7 @@
rat_heal = 35
/obj/item/food/cheese/firm_cheese/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/firm_cheese_slice, 3, 30)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cheese/firm_cheese_slice, 3, 3 SECONDS)
/obj/item/food/cheese/firm_cheese_slice
name = "firm cheese slice"
code/game/objects/items/food/dough.dm
+5 -5
View File
@@ -14,7 +14,7 @@
// Dough + rolling pin = flat dough
/obj/item/food/dough/MakeProcessable()
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatdough, 1, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatdough, 1, 3 SECONDS, table_required = TRUE)
/obj/item/food/flatdough
name = "flat dough"
@@ -30,7 +30,7 @@
// sliceable into 3xdoughslices
/obj/item/food/flatdough/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/doughslice, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/doughslice, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/pizzabread
name = "pizza bread"
@@ -60,7 +60,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/bun, rand(20 SECONDS, 25 SECONDS), TRUE, TRUE)
/obj/item/food/doughslice/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/bait/doughball, 5, 30)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/bait/doughball, 5, 3 SECONDS)
/obj/item/food/bun
name = "bun"
@@ -90,7 +90,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/cake/plain, rand(70 SECONDS, 90 SECONDS), TRUE, TRUE)
/obj/item/food/cakebatter/MakeProcessable()
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/piedough, 1, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/piedough, 1, 3 SECONDS, table_required = TRUE)
/obj/item/food/piedough
name = "pie dough"
@@ -105,7 +105,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/pie/plain, rand(30 SECONDS, 45 SECONDS), TRUE, TRUE)
/obj/item/food/piedough/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rawpastrybase, 6, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rawpastrybase, 6, 3 SECONDS, table_required = TRUE)
/obj/item/food/rawpastrybase
name = "raw pastry base"
code/game/objects/items/food/lizard.dm
+6 -6
View File
@@ -51,7 +51,7 @@
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/headcheese/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/headcheese_slice, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/headcheese_slice, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/headcheese_slice
name = "headcheese slice"
@@ -289,7 +289,7 @@
AddComponent(/datum/component/bakeable, /obj/item/food/bread/root, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
/obj/item/food/rootdough/MakeProcessable()
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatrootdough, 1, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/food/flatrootdough, 1, 3 SECONDS, table_required = TRUE)
/obj/item/food/flatrootdough
name = "flat rootdough"
@@ -301,7 +301,7 @@
foodtypes = VEGETABLES | NUTS
/obj/item/food/flatrootdough/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rootdoughslice, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/rootdoughslice, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/flatrootdough/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/root_flatbread, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
@@ -317,7 +317,7 @@
foodtypes = VEGETABLES | NUTS
/obj/item/food/rootdoughslice/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spaghetti/nizaya, 1, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spaghetti/nizaya, 1, 3 SECONDS, table_required = TRUE)
/obj/item/food/rootdoughslice/MakeBakeable()
AddComponent(/datum/component/bakeable, /obj/item/food/rootroll, rand(15 SECONDS, 25 SECONDS), TRUE, TRUE)
@@ -362,7 +362,7 @@
AddComponent(/datum/component/customizable_reagent_holder, /obj/item/food/bread/empty, CUSTOM_INGREDIENT_ICON_FILL, max_ingredients = 8)
/obj/item/food/bread/root/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/root, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/root, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/breadslice/root
name = "rootbread slice"
@@ -514,7 +514,7 @@
foodtypes = NUTS | SUGAR
/obj/item/food/cake/korta_brittle/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/korta_brittle, 5, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/korta_brittle, 5, 3 SECONDS, table_required = TRUE)
/obj/item/food/cakeslice/korta_brittle
name = "korta brittle slice"
code/game/objects/items/food/meat.dm
+16 -16
View File
@@ -119,7 +119,7 @@
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/vegetariansushiroll/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/vegetariansushislice, 4, 20)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/vegetariansushislice, 4)
/obj/item/food/vegetariansushislice
name = "vegetarian sushi slice"
@@ -140,7 +140,7 @@
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/spicyfiletsushiroll/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spicyfiletsushislice, 4, 20)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/spicyfiletsushislice, 4)
/obj/item/food/spicyfiletsushislice
name = "spicy filet sushi slice"
@@ -160,7 +160,7 @@
desc = "A roll of customized sushi."
/obj/item/food/sushi/empty/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sushislice/empty, 4, 20)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sushislice/empty, 4)
/obj/item/food/sushislice/empty
name = "sushi slice"
@@ -234,7 +234,7 @@
AddComponent(/datum/component/grillable, meatball_type, rand(30 SECONDS, 40 SECONDS), TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE
/obj/item/food/raw_meatball/MakeProcessable()
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, patty_type, 1, 20, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, patty_type, 1, table_required = TRUE)
/obj/item/food/raw_meatball/human
name = "strange raw meatball"
@@ -387,8 +387,8 @@
venue_value = FOOD_PRICE_CHEAP
/obj/item/food/sausage/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/salami, 6, 3 SECONDS, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/sausage/american, 1, 3 SECONDS, table_required = TRUE)
/obj/item/food/sausage/american
name = "american sausage"
@@ -708,7 +708,7 @@
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE //Add medium rare later maybe?
/obj/item/food/meat/slab/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain, 3, 3 SECONDS, table_required = TRUE)
///////////////////////////////////// HUMAN MEATS //////////////////////////////////////////////////////
@@ -722,7 +722,7 @@
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/plain/human, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE //Add medium rare later maybe?
/obj/item/food/meat/slab/human/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain/human, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/plain/human, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/human/mutant/slime
icon_state = "slimemeat"
@@ -877,7 +877,7 @@
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/killertomato, rand(70 SECONDS, 85 SECONDS), TRUE, TRUE)
/obj/item/food/meat/slab/killertomato/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/killertomato, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/killertomato, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/bear
name = "bear meat"
@@ -888,7 +888,7 @@
foodtypes = RAW | MEAT
/obj/item/food/meat/slab/bear/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/bear, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/bear/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/bear, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE
@@ -907,7 +907,7 @@
foodtypes = RAW | MEAT
/obj/item/food/meat/slab/xeno/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/xeno, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/xeno, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/xeno/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/xeno, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE
@@ -921,7 +921,7 @@
foodtypes = RAW | MEAT | TOXIC
/obj/item/food/meat/slab/spider/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/spider, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/spider, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/spider/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/spider, rand(40 SECONDS, 70 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE
@@ -982,7 +982,7 @@
foodtypes = RAW | MEAT
/obj/item/food/meat/slab/gondola/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/gondola, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/gondola/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/gondola, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE //Add medium rare later maybe?
@@ -997,7 +997,7 @@
/obj/item/food/meat/slab/penguin/MakeProcessable()
. = ..()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/penguin, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/penguin, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/penguin/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/penguin, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE //Add medium rare later maybe?
@@ -1031,7 +1031,7 @@
tastes = list("chicken" = 1)
/obj/item/food/meat/slab/chicken/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/meat/rawcutlet/chicken, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/meat/slab/chicken/MakeGrillable()
AddComponent(/datum/component/grillable, /obj/item/food/meat/steak/chicken, rand(30 SECONDS, 90 SECONDS), TRUE, TRUE, /datum/pollutant/food/fried_meat) //SKYRAT EDIT CHANGE) //Add medium rare later maybe? (no this is chicken)
@@ -1348,7 +1348,7 @@
venue_value = FOOD_PRICE_EXOTIC
/obj/item/food/beef_wellington/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/beef_wellington_slice, 3, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/beef_wellington_slice, 3, 3 SECONDS, table_required = TRUE)
/obj/item/food/beef_wellington_slice
name = "beef wellington slice"
code/game/objects/items/food/moth.dm
+4 -4
View File
@@ -141,7 +141,7 @@
burns_in_oven = TRUE
/obj/item/food/green_lasagne/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/green_lasagne_slice, 6, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/green_lasagne_slice, 6, 3 SECONDS, table_required = TRUE)
/obj/item/food/green_lasagne_slice
name = "green lasagne al forno slice"
@@ -178,7 +178,7 @@
burns_in_oven = TRUE
/obj/item/food/big_baked_rice/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/lil_baked_rice, 6, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/lil_baked_rice, 6, 3 SECONDS, table_required = TRUE)
/obj/item/food/lil_baked_rice
name = "lil baked rice"
@@ -699,7 +699,7 @@
w_class = WEIGHT_CLASS_SMALL
/obj/item/food/bread/corn/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/corn, 6, 20)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/breadslice/corn, 6)
/obj/item/food/breadslice/corn
name = "cornbread slice"
@@ -730,7 +730,7 @@
foodtypes = VEGETABLES | SUGAR
/obj/item/food/cake/mothmallow/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/mothmallow, 6, 20)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/cakeslice/mothmallow, 6)
/obj/item/food/cakeslice/mothmallow
name = "mothmallow"
code/game/objects/items/food/pie.dm
+6 -6
View File
@@ -51,8 +51,8 @@
if(isliving(hit_atom))
var/mob/living/living_target_getting_hit = hit_atom
if(stunning)
//living_target_getting_hit.Paralyze(20) //splat! //ORIGINAL
living_target_getting_hit.StaminaKnockdown(10, TRUE) //SKYRAT EDIT CHANGE - COMBAT
//living_target_getting_hit.Paralyze(2 SECONDS) //splat! //ORIGINAL
living_target_getting_hit.StaminaKnockdown(1 SECONDS, TRUE) //SKYRAT EDIT CHANGE - COMBAT
living_target_getting_hit.adjust_blurriness(1)
living_target_getting_hit.visible_message(span_warning("[living_target_getting_hit] is creamed by [src]!"), span_userdanger("You've been creamed by [src]!"))
playsound(living_target_getting_hit, SFX_DESECRATION, 50, TRUE)
@@ -155,7 +155,7 @@
foodtypes = GRAIN | VEGETABLES | SUGAR
/obj/item/food/pie/pumpkinpie/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/pumpkin, 5, 20, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/pumpkin, 5, table_required = TRUE)
/obj/item/food/pieslice/pumpkin
name = "pumpkin pie slice"
@@ -214,7 +214,7 @@
foodtypes = GRAIN | VEGETABLES
/obj/item/food/pie/blumpkinpie/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/blumpkin, 5, 20, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/blumpkin, 5, table_required = TRUE)
/obj/item/food/pieslice/blumpkin
name = "blumpkin pie slice"
@@ -234,7 +234,7 @@
venue_value = FOOD_PRICE_EXOTIC
/obj/item/food/pie/dulcedebatata/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/dulcedebatata, 5, 20, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/dulcedebatata, 5, table_required = TRUE)
/obj/item/food/pieslice/dulcedebatata
name = "dulce de batata slice"
@@ -287,4 +287,4 @@
foodtypes = GRAIN | DAIRY | SUGAR
/obj/item/food/pie/frenchsilkpie/MakeProcessable()
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/frenchsilk, 5, 20)
AddElement(/datum/element/processable, TOOL_KNIFE, /obj/item/food/pieslice/frenchsilk, 5)
code/game/objects/items/food/pizza.dm
+4 -4
View File
@@ -23,9 +23,9 @@
/obj/item/food/pizza/MakeProcessable()
if (slice_type)
AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, 6, 30, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_SAW, slice_type, 6, 45, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_SCALPEL, slice_type, 6, 60, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_KNIFE, slice_type, 6, 3 SECONDS, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_SAW, slice_type, 6, 4.5 SECONDS, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_SCALPEL, slice_type, 6, 6 SECONDS, table_required = TRUE)
// Pizza Slice
/obj/item/food/pizzaslice
@@ -36,7 +36,7 @@
decomp_type = /obj/item/food/pizzaslice/moldy
/obj/item/food/pizzaslice/MakeProcessable()
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/stack/sheet/pizza, 1, 10, table_required = TRUE)
AddElement(/datum/element/processable, TOOL_ROLLINGPIN, /obj/item/stack/sheet/pizza, 1, 1 SECONDS, table_required = TRUE)
/obj/item/food/pizza/margherita