From b56a34de6cef8ae029d203a7c83f23a33dbaec21 Mon Sep 17 00:00:00 2001 From: Drsmail Date: Fri, 3 Jan 2025 01:19:08 +0300 Subject: [PATCH 1/8] Slices have a base class /food/slice --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 6 +- .../RandomRuins/SpaceRuins/blowntcommsat.dmm | 2 +- .../RandomRuins/SpaceRuins/moonoutpost19.dmm | 8 +- .../SpaceRuins/syndiecakesfactory.dmm | 8 +- .../SpaceRuins/wreckedcargoship.dmm | 4 +- _maps/map_files/generic/centcomm.dmm | 2 +- _maps/map_files/stations/boxstation.dmm | 6 +- _maps/map_files/stations/cerestation.dmm | 6 +- _maps/map_files/stations/deltastation.dmm | 6 +- _maps/map_files/stations/emeraldstation.dmm | 2 +- _maps/map_files/stations/metastation.dmm | 8 +- .../granters/action_granters/summon_cheese.dm | 4 +- code/game/objects/items/toys.dm | 2 +- .../contractor/datums/syndicate_contract.dm | 2 +- .../food_and_drinks/food/customizables.dm | 2 +- .../food_and_drinks/food/foods/baked_goods.dm | 108 +-- .../food_and_drinks/food/foods/bread.dm | 32 +- .../food_and_drinks/food/foods/ingredients.dm | 34 +- .../food_and_drinks/food/foods/meat.dm | 4 +- .../food_and_drinks/food/foods/pizza.dm | 52 +- .../food_and_drinks/food/foods/seafood.dm | 32 +- code/modules/food_and_drinks/food_base.dm | 32 +- .../kitchen_machinery/deep_fryer.dm | 2 +- .../kitchen_machinery/processor.dm | 2 +- .../food_and_drinks/recipes/recipes_candy.dm | 2 +- .../food_and_drinks/recipes/recipes_grill.dm | 28 +- .../recipes/recipes_microwave.dm | 114 +-- .../food_and_drinks/recipes/recipes_oven.dm | 84 +-- .../recipes/tablecraft/recipes_table.dm | 28 +- code/modules/hydroponics/grown/melon.dm | 2 +- code/modules/hydroponics/grown/onion.dm | 8 +- code/modules/hydroponics/grown/pineapple.dm | 2 +- code/modules/hydroponics/grown/tomato.dm | 2 +- .../mob/living/simple_animal/friendly/cat.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 2 +- code/modules/projectiles/guns/chaos_bolt.dm | 4 +- .../chemistry/machinery/reagentgrinder.dm | 2 +- .../chemistry/reagents/food_reagents.dm | 4 +- .../chemistry/recipes/slime_extracts.dm | 26 +- .../secondary/kitchen/random_bulk_food.dm | 2 +- .../Scripts/27268_snake_case_remap.txt | 16 +- tools/pr_sql/27268/snake_case_type_remap.json | 694 ++++++++++++++---- 42 files changed, 911 insertions(+), 477 deletions(-) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 38ab7a7b2951..80a6288e247c 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -33,7 +33,7 @@ /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "j" = ( -/obj/item/food/mushroompizzaslice, +obj/item/food/slice/mushroom_pizza, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/pizza_party) @@ -144,13 +144,13 @@ /area/ruin/powered/pizza_party) "D" = ( /obj/structure/table/wood, -/obj/item/food/margheritapizzaslice, +obj/item/food/slice/margherita_pizza, /obj/item/trash/plate, /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "E" = ( /obj/structure/table/wood, -/obj/item/food/meatpizzaslice, +obj/item/food/slice/meat_pizza, /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "F" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index b7c699afbf25..bd783073ba25 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -585,7 +585,7 @@ /turf/simulated/wall/r_wall, /area/space/nearstation) "Nw" = ( -/obj/item/food/xenomeatbreadslice{ +/obj/item/food/slice/xeno_meat_bread{ name = "green mold bread slice" }, /turf/simulated/floor/plating/airless, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index dea5f39dc337..fc8da4568505 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -2001,7 +2001,7 @@ }, /area/ruin/space/moonbase19) "gy" = ( -/obj/item/food/xenomeatbreadslice{ +/obj/item/food/slice/xeno_meat_bread{ pixel_y = 5 }, /obj/item/reagent_containers/drinks/coffee{ @@ -6703,12 +6703,12 @@ }, /area/ruin/space/moonbase19) "yR" = ( -/obj/item/food/xenomeatbreadslice, -/obj/item/food/xenomeatbreadslice{ +/obj/item/food/slice/xeno_meat_bread, +/obj/item/food/slice/xeno_meat_bread{ pixel_y = 7; pixel_x = 6 }, -/obj/item/food/xenomeatbreadslice{ +/obj/item/food/slice/xeno_meat_bread{ pixel_y = 9; pixel_x = -5 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index 0fef45873213..d61fec6a164d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -371,11 +371,11 @@ /area/ruin/space/syndicakefactory) "qd" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/food/breadslice, -/obj/item/food/breadslice{ +/obj/item/food/slice/bread, +/obj/item/food/slice/bread{ pixel_y = 4 }, -/obj/item/food/breadslice{ +/obj/item/food/slice/bread{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -1069,7 +1069,7 @@ pixel_x = 8; pixel_y = 8 }, -/obj/item/food/birthdaycakeslice, +/obj/item/food/slice/birthday_cake, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index 0f6d16eea8e9..99bb732ee57f 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -224,8 +224,8 @@ /area/ruin/space/wreck_cargoship) "jm" = ( /obj/item/toy/plushie/ipcplushie, -/obj/item/food/breadslice, -/obj/item/food/breadslice, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, /obj/item/paper/crumpled{ name = "unintelligible scribbles"; info = "toast... i must... the plushie..." diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 74893a0466a7..5c82a2d0210e 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -4226,7 +4226,7 @@ /area/centcom/suppy) "nY" = ( /obj/structure/table/wood, -/obj/item/food/mushroompizzaslice{ +obj/item/food/slice/mushroom_pizza{ pixel_x = -5; pixel_y = 5 }, diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index b635a75832e7..7413bf9d2c1d 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -80065,9 +80065,9 @@ /area/station/science/test_chamber) "tWD" = ( /obj/structure/closet/crate, -/obj/item/food/breadslice, -/obj/item/food/breadslice, -/obj/item/food/breadslice, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index edb32ddb23cc..fb5bc7cad490 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -32551,9 +32551,9 @@ /area/station/security/permabrig) "flp" = ( /obj/structure/closet/crate, -/obj/item/food/breadslice, -/obj/item/food/breadslice, -/obj/item/food/breadslice, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 142f79b280f6..3bbe79ebb6f4 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -86456,9 +86456,9 @@ /area/station/hallway/secondary/entry/south) "urY" = ( /obj/structure/closet/crate, -/obj/item/food/breadslice, -/obj/item/food/breadslice, -/obj/item/food/breadslice, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index ec842cd5687a..ced9023b9275 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -38943,7 +38943,7 @@ /obj/item/food/grown/pumpkin{ pixel_y = 14 }, -/obj/item/food/pumpkinpieslice, +/obj/item/food/slice/pumpkinpie, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "hGX" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 498f6efd9b14..eb45a7905e2e 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -58857,7 +58857,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/item/food/carrotcakeslice{ +/obj/item/food/slice/carrot_cake{ pixel_x = 8; pixel_y = -2 }, @@ -70328,9 +70328,9 @@ "qvp" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/food/breadslice, -/obj/item/food/breadslice, -/obj/item/food/breadslice, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, +/obj/item/food/slice/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/code/game/objects/items/granters/action_granters/summon_cheese.dm b/code/game/objects/items/granters/action_granters/summon_cheese.dm index 29209f6479cb..7f04ba9dd2fd 100644 --- a/code/game/objects/items/granters/action_granters/summon_cheese.dm +++ b/code/game/objects/items/granters/action_granters/summon_cheese.dm @@ -22,7 +22,7 @@ /obj/item/book/granter/spell/summon_cheese/recoil(mob/living/user) to_chat(user, "[src] turns into a wedge of cheese!") - var/obj/item/food/cheesewedge/presliced/book_cheese = new + var/obj/item/food/slice/cheesewedge/presliced/book_cheese = new user.drop_item() user.put_in_hands(book_cheese) qdel(src) @@ -35,7 +35,7 @@ overlay = null action_icon_state = "cheese_wedge" action_background_icon_state = "bg_spell" - summon_type = list(/obj/item/food/cheesewedge/presliced) + summon_type = list(/obj/item/food/slice/cheesewedge/presliced) summon_amt = 9 aoe_range = 1 summon_ignore_prev_spawn_points = TRUE diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8190b14d1a4b..a753a1c091b0 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -832,7 +832,7 @@ /obj/item/toy/plushie/ipcplushie/attack_by(obj/item/attacking, mob/user, params) if(..()) return FINISH_ATTACK - if(istype(attacking, /obj/item/food/breadslice)) + if(istype(attacking, /obj/item/food/slice/bread)) new /obj/item/food/toast(get_turf(loc)) to_chat(user, "You insert bread into the toaster.") playsound(loc, 'sound/machines/ding.ogg', 50, 1) diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm index 55dfc2453474..f751f806ef40 100644 --- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm @@ -423,7 +423,7 @@ M.update_icons() // Supply them with some chow. How generous is the Syndicate? - var/obj/item/food/breadslice/food = new(get_turf(M)) + var/obj/item/food/slice/bread/food = new(get_turf(M)) food.name = "stale bread" food.desc = "Looks like your captors care for their prisoners as much as their bread." food.trash = null diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index d667e8827d58..85d0bd2fd367 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -6,7 +6,7 @@ do {\ qdel(src);\ } while(FALSE) -/obj/item/food/breadslice/attackby__legacy__attackchain(obj/item/W, mob/user, params) +/obj/item/food/slice/bread/attackby__legacy__attackchain(obj/item/W, mob/user, params) if(istype(W, /obj/item/food) && !(W.flags & NODROP)) MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/sandwich) return diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 1ae2031b7288..91afbaf60b0e 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -10,7 +10,7 @@ desc = "A favorite desert of a certain wascally wabbit. Not a lie." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "carrotcake" - slice_path = /obj/item/food/carrotcakeslice + slice_path = /obj/item/food/slice/carrot_cake slices_num = 5 bitesize = 3 filling_color = "#FFD675" @@ -18,7 +18,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/carrotcakeslice +/obj/item/food/slice/carrot_cake name = "carrot cake slice" desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." icon = 'icons/obj/food/bakedgoods.dmi' @@ -34,7 +34,7 @@ desc = "A squishy cake-thing." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "braincake" - slice_path = /obj/item/food/braincakeslice + slice_path = /obj/item/food/slice/brain_cake slices_num = 5 filling_color = "#E6AEDB" bitesize = 3 @@ -42,7 +42,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/braincakeslice +/obj/item/food/slice/brain_cake name = "brain cake slice" desc = "Lemme tell you something about brains. THEY'RE DELICIOUS." icon = 'icons/obj/food/bakedgoods.dmi' @@ -57,7 +57,7 @@ desc = "DANGEROUSLY cheesy." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cheesecake" - slice_path = /obj/item/food/cheesecakeslice + slice_path = /obj/item/food/slice/cheese_cake slices_num = 5 filling_color = "#FAF7AF" bitesize = 3 @@ -65,7 +65,7 @@ tastes = list("cake" = 4, "cream cheese" = 3) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/cheesecakeslice +/obj/item/food/slice/cheese_cake name = "cheese cake slice" desc = "Slice of pure cheestisfaction." icon = 'icons/obj/food/bakedgoods.dmi' @@ -80,7 +80,7 @@ desc = "A plain cake, not a lie." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plaincake" - slice_path = /obj/item/food/plaincakeslice + slice_path = /obj/item/food/slice/plain_cake slices_num = 5 bitesize = 3 filling_color = "#F7EDD5" @@ -88,7 +88,7 @@ tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/plaincakeslice +/obj/item/food/slice/plain_cake name = "plain cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -103,7 +103,7 @@ desc = "A cake with added orange." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "orangecake" - slice_path = /obj/item/food/orangecakeslice + slice_path = /obj/item/food/slice/orange_cake slices_num = 5 bitesize = 3 filling_color = "#FADA8E" @@ -111,7 +111,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/orangecakeslice +/obj/item/food/slice/orange_cake name = "orange cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -126,7 +126,7 @@ desc = "A cake with added bananas." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "bananacake" - slice_path = /obj/item/food/bananacakeslice + slice_path = /obj/item/food/slice/banana_cake slices_num = 5 bitesize = 3 filling_color = "#FADA8E" @@ -134,7 +134,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/bananacakeslice +/obj/item/food/slice/banana_cake name = "banana cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -150,14 +150,14 @@ icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "limecake" bitesize = 3 - slice_path = /obj/item/food/limecakeslice + slice_path = /obj/item/food/slice/lime_cake slices_num = 5 filling_color = "#CBFA8E" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/limecakeslice +/obj/item/food/slice/lime_cake name = "lime cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -172,7 +172,7 @@ desc = "A cake with added lemon." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "lemoncake" - slice_path = /obj/item/food/lemoncakeslice + slice_path = /obj/item/food/slice/lemon_cake slices_num = 5 bitesize = 3 filling_color = "#FAFA8E" @@ -180,7 +180,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/lemoncakeslice +/obj/item/food/slice/lemon_cake name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -195,7 +195,7 @@ desc = "A cake with added chocolate." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "chocolatecake" - slice_path = /obj/item/food/chocolatecakeslice + slice_path = /obj/item/food/slice/chocolate_cake slices_num = 5 bitesize = 3 filling_color = "#805930" @@ -203,7 +203,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/chocolatecakeslice +/obj/item/food/slice/chocolate_cake name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -218,7 +218,7 @@ desc = "Happy Birthday..." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "birthdaycake" - slice_path = /obj/item/food/birthdaycakeslice + slice_path = /obj/item/food/slice/birthday_cake slices_num = 5 filling_color = "#FFD6D6" bitesize = 3 @@ -226,7 +226,7 @@ tastes = list("cake" = 5, "sweetness" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/birthdaycakeslice +/obj/item/food/slice/birthday_cake name = "birthday cake slice" desc = "A slice of your birthday!" icon = 'icons/obj/food/bakedgoods.dmi' @@ -241,7 +241,7 @@ desc = "A cake centered with Apple." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applecake" - slice_path = /obj/item/food/applecakeslice + slice_path = /obj/item/food/slice/apple_cake slices_num = 5 bitesize = 3 filling_color = "#EBF5B8" @@ -249,7 +249,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/applecakeslice +/obj/item/food/slice/apple_cake name = "apple cake slice" desc = "A slice of heavenly cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -264,7 +264,7 @@ desc = "A cake made for angels and chaplains alike! Contains holy water." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "holy_cake" - slice_path = /obj/item/food/holy_cake_slice + slice_path = /obj/item/food/slice/holy_cake slices_num = 5 bitesize = 3 filling_color = "#ffffff" @@ -272,7 +272,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/holy_cake_slice +/obj/item/food/slice/holy_cake name = "holy cake slice" desc = "A slice of heavenly cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -287,7 +287,7 @@ desc = "A chocolate cake with five strawberries on top. For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "liars_cake" - slice_path = /obj/item/food/liars_slice + slice_path = /obj/item/food/slice/liars slices_num = 5 bitesize = 3 filling_color = "#240606c7" @@ -295,7 +295,7 @@ tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/liars_slice +/obj/item/food/slice/liars name = "strawberry chocolate cake slice" desc = "Just a slice of cake with five strawberries on top. \ For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF." @@ -311,7 +311,7 @@ desc = "A plain cake, filled with assortment of blackberries and strawberries!" icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "vanilla_berry_cake" - slice_path = /obj/item/food/vanilla_berry_cake_slice + slice_path = /obj/item/food/slice/vanilla_berry_cake slices_num = 5 bitesize = 3 filling_color = "#f0e3e3c7" @@ -319,7 +319,7 @@ tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/vanilla_berry_cake_slice +/obj/item/food/slice/vanilla_berry_cake name = "blackberry and strawberry vanilla cake slice" desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" icon = 'icons/obj/food/bakedgoods.dmi' @@ -334,7 +334,7 @@ desc = "A \"cake\" that is made with electronic boards and leaks acid..." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "hardware_cake" - slice_path = /obj/item/food/hardware_cake_slice + slice_path = /obj/item/food/slice/hardware_cake slices_num = 5 bitesize = 3 filling_color = "#4ac25e" @@ -342,7 +342,7 @@ tastes = list("acid" = 3, "metal" = 4, "glass" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/hardware_cake_slice +/obj/item/food/slice/hardware_cake name = "hardware cake slice" desc = "A slice of electronic boards and some acid." icon = 'icons/obj/food/bakedgoods.dmi' @@ -357,7 +357,7 @@ desc = "A cake centred with Plums." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plum_cake" - slice_path = /obj/item/food/plum_cake_slice + slice_path = /obj/item/food/slice/plum_cake slices_num = 5 bitesize = 3 filling_color = "#a128c5" @@ -365,7 +365,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/plum_cake_slice +/obj/item/food/slice/plum_cake name = "plum cake slice" desc = "A slice of plum cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -380,7 +380,7 @@ desc = "A condensed cake made for filling people up quickly." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pound_cake" - slice_path = /obj/item/food/pound_cake_slice + slice_path = /obj/item/food/slice/pound_cake slices_num = 5 bitesize = 3 filling_color = "#c4cab7" @@ -388,7 +388,7 @@ tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/pound_cake_slice +/obj/item/food/slice/pound_cake name = "pound cake slice" desc = "A slice of condensed cake made for filling people up quickly." icon = 'icons/obj/food/bakedgoods.dmi' @@ -403,7 +403,7 @@ desc = "A hollow cake with real pumpkin." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkin_spice_cake" - slice_path = /obj/item/food/pumpkin_spice_cake_slice + slice_path = /obj/item/food/slice/pumpkin_spice_cake slices_num = 5 bitesize = 3 filling_color = "#ee710a" @@ -411,7 +411,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/pumpkin_spice_cake_slice +/obj/item/food/slice/pumpkin_spice_cake name = "pumpkin spice cake slice" desc = "A spicy slice of pumpkin goodness." icon = 'icons/obj/food/bakedgoods.dmi' @@ -426,7 +426,7 @@ desc = "A cake made of slimes. Probably not electrified." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "slime_cake" - slice_path = /obj/item/food/slime_cake_slice + slice_path = /obj/item/food/slice/slime_cake slices_num = 5 bitesize = 3 filling_color = "#0adfee" @@ -434,7 +434,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slime_cake_slice +/obj/item/food/slice/slime_cake name = "slime cake slice" desc = "A slice of slime cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -449,7 +449,7 @@ desc = "A spaceman's trumpet frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "trumpet_cake" - slice_path = /obj/item/food/spaceman_cake_slice + slice_path = /obj/item/food/slice/spaceman_cake slices_num = 5 bitesize = 3 filling_color = "#610977" @@ -457,7 +457,7 @@ tastes = list("cake" = 4, "violets" = 2, "jam" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/spaceman_cake_slice +/obj/item/food/slice/spaceman_cake name = "spaceman's cake slice" desc = "A slice of spaceman's trumpet frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -472,7 +472,7 @@ desc = "A vanilla frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "vanilla_cake" - slice_path = /obj/item/food/vanilla_cake_slice + slice_path = /obj/item/food/slice/vanilla_cake slices_num = 5 bitesize = 3 filling_color = "#ece7ee" @@ -480,7 +480,7 @@ tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/vanilla_cake_slice +/obj/item/food/slice/vanilla_cake name = "vanilla cake slice" desc = "A slice of vanilla frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -495,14 +495,14 @@ icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "mothmallow_tray" list_reagents = list("nutriment" = 20, "sugar" = 20) - slice_path = /obj/item/food/mothmallowslice + slice_path = /obj/item/food/slice/mothmallow slices_num = 5 bitesize = 3 filling_color = "#eebe98" tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/mothmallowslice +/obj/item/food/slice/mothmallow name = "mothmallow" desc = "Fluffy little clouds of joy- in a strangely moth-like colour." icon = 'icons/obj/food/bakedgoods.dmi' @@ -690,7 +690,7 @@ desc = "A delicious treat for the autumn months." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkinpie" - slice_path = /obj/item/food/pumpkinpieslice + slice_path = /obj/item/food/slice/pumpkinpie slices_num = 5 bitesize = 3 filling_color = "#F5B951" @@ -698,7 +698,7 @@ tastes = list("pie" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/pumpkinpieslice +/obj/item/food/slice/pumpkinpie name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon = 'icons/obj/food/bakedgoods.dmi' @@ -723,7 +723,7 @@ desc = "An odd blue pie made with toxic blumpkin." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "blumpkin_pie" - slice_path = /obj/item/food/blumpkin_pie_slice + slice_path = /obj/item/food/slice/blumpkin_pie slices_num = 5 bitesize = 3 filling_color = "#102d8b" @@ -731,7 +731,7 @@ tastes = list("pie" = 1, "a mouthful of pool water" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/blumpkin_pie_slice +/obj/item/food/slice/blumpkin_pie name = "blumpkin pie slice" desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?" icon = 'icons/obj/food/bakedgoods.dmi' @@ -746,7 +746,7 @@ desc = "A decadent pie made of a creamy chocolate mousse filling topped with a layer of whipped cream and chocolate shavings. Sliceable." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "french_silk_pie" - slice_path = /obj/item/food/french_silk_pie_slice + slice_path = /obj/item/food/slice/french_silk_pie slices_num = 5 bitesize = 3 filling_color = "#5e4337" @@ -754,7 +754,7 @@ tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/french_silk_pie_slice +/obj/item/food/slice/french_silk_pie name = "french silk pie slice" desc = "A slice of french silk pie, filled with a chocolate mousse and topped with a layer of whipped cream and chocolate shavings. Delicious enough to make you cry." icon = 'icons/obj/food/bakedgoods.dmi' @@ -769,7 +769,7 @@ desc = "Tastes like blue and cold." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "frosty_pie" - slice_path = /obj/item/food/frosty_pie_slice + slice_path = /obj/item/food/slice/frosty_pie slices_num = 5 bitesize = 3 filling_color = "#5e4337" @@ -777,7 +777,7 @@ tastes = list("mint" = 1, "pie" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/frosty_pie_slice +/obj/item/food/slice/frosty_pie name = "frosty pie slice" desc = "Tasty blue, like my favourite crayon!" icon = 'icons/obj/food/bakedgoods.dmi' @@ -1325,7 +1325,7 @@ desc = "A delicious jelly made with sweet potatoes." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "dulce_de_batata" - slice_path = /obj/item/food/dulce_de_batata_slice + slice_path = /obj/item/food/slice/dulce_de_batata slices_num = 5 bitesize = 3 filling_color = "#411b02" @@ -1333,7 +1333,7 @@ tastes = list("jelly" = 1, "sweet potato" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/dulce_de_batata_slice +/obj/item/food/slice/dulce_de_batata name = "dulce de batata slice" desc = "Tasty blue, like my favourite crayon!" icon = 'icons/obj/food/bakedgoods.dmi' diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 31eb3b340960..435cb491f46c 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -8,14 +8,14 @@ desc = "The culinary base of every self-respecting eloquen/tg/entleman." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbread" - slice_path = /obj/item/food/meatbreadslice + slice_path = /obj/item/food/slice/meat_bread slices_num = 5 filling_color = "#FF7575" list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5) tastes = list("bread" = 10, "meat" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/meatbreadslice +/obj/item/food/slice/meat_bread name = "meatbread slice" desc = "A slice of delicious meatbread." icon = 'icons/obj/food/burgerbread.dmi' @@ -28,14 +28,14 @@ desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenomeatbread" - slice_path = /obj/item/food/xenomeatbreadslice + slice_path = /obj/item/food/slice/xeno_meat_bread slices_num = 5 filling_color = "#8AFF75" list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5) tastes = list("bread" = 10, "acid" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/xenomeatbreadslice +/obj/item/food/slice/xeno_meat_bread name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." icon = 'icons/obj/food/burgerbread.dmi' @@ -48,13 +48,13 @@ desc = "Reassuringly green meatloaf made from spider meat." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatbread" - slice_path = /obj/item/food/spidermeatbreadslice + slice_path = /obj/item/food/slice/spider_meat_bread slices_num = 5 list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5) tastes = list("bread" = 10, "cobwebs" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/spidermeatbreadslice +/obj/item/food/slice/spider_meat_bread name = "spider meat bread slice" desc = "A slice of meatloaf made from an animal that most likely still wants you dead." icon = 'icons/obj/food/burgerbread.dmi' @@ -68,14 +68,14 @@ desc = "A heavenly and filling treat." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabread" - slice_path = /obj/item/food/bananabreadslice + slice_path = /obj/item/food/slice/banana_bread slices_num = 5 filling_color = "#EDE5AD" list_reagents = list("banana" = 20, "nutriment" = 20) tastes = list("bread" = 10, "banana" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/bananabreadslice +/obj/item/food/slice/banana_bread name = "banana-nut bread slice" desc = "A slice of delicious banana bread." icon = 'icons/obj/food/burgerbread.dmi' @@ -89,14 +89,14 @@ desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubread" - slice_path = /obj/item/food/tofubreadslice + slice_path = /obj/item/food/slice/tofu_bread slices_num = 5 filling_color = "#F7FFE0" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("bread" = 10, "tofu" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/tofubreadslice +/obj/item/food/slice/tofu_bread name = "tofubread slice" desc = "A slice of delicious tofubread." icon = 'icons/obj/food/burgerbread.dmi' @@ -109,14 +109,14 @@ desc = "Some plain old Earthen bread." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bread" - slice_path = /obj/item/food/breadslice + slice_path = /obj/item/food/slice/bread slices_num = 6 filling_color = "#FFE396" list_reagents = list("nutriment" = 10) tastes = list("bread" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/breadslice +/obj/item/food/slice/bread name = "bread slice" desc = "A slice of home." icon = 'icons/obj/food/burgerbread.dmi' @@ -131,14 +131,14 @@ desc = "Yum yum yum!" icon = 'icons/obj/food/burgerbread.dmi' icon_state = "creamcheesebread" - slice_path = /obj/item/food/creamcheesebreadslice + slice_path = /obj/item/food/slice/cream_cheese_bread slices_num = 5 filling_color = "#FFF896" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("bread" = 10, "cheese" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/creamcheesebreadslice +/obj/item/food/slice/cream_cheese_bread name = "cream cheese bread slice" desc = "A slice of yum!" icon = 'icons/obj/food/burgerbread.dmi' @@ -153,14 +153,14 @@ desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!" icon = 'icons/obj/food/burgerbread.dmi' icon_state = "banarnarbread" - slice_path = /obj/item/food/banarnarbreadslice + slice_path = /obj/item/food/slice/banarnarbread slices_num = 5 filling_color = "#6F0000" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("heresy" = 10, "banana" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/banarnarbreadslice +/obj/item/food/slice/banarnarbread name = "banarnarbread slice" desc = "A slice of delicious mah'weyh pleggh at e'ntrath!" icon = 'icons/obj/food/burgerbread.dmi' diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index da8df590bd88..e34a3158eb38 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -41,13 +41,13 @@ name = "cheese wheel" desc = "A big wheel of delicious Cheddar." icon_state = "cheesewheel" - slice_path = /obj/item/food/cheesewedge + slice_path = /obj/item/food/slice/cheesewedge slices_num = 5 filling_color = "#FFF700" list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20) tastes = list("cheese" = 1) -/obj/item/food/cheesewedge +/obj/item/food/slice/cheesewedge name = "cheese wedge" desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" @@ -58,12 +58,12 @@ name = "smoked cheese wheel" desc = "A wheel of fancy imported-style smoked cheese." icon_state = "cheesewheel-smoked" - slice_path = /obj/item/food/cheesewedge/smoked + slice_path = /obj/item/food/slice/cheesewedge/smoked slices_num = 4 list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15) tastes = list("cheese" = 1, "smoke" = 2) -/obj/item/food/cheesewedge/smoked +/obj/item/food/slice/cheesewedge/smoked name = "smoked cheese wedge" desc = "A wedge of fancy smoked cheese." icon_state = "cheesewedge-smoked" @@ -73,12 +73,12 @@ name = "edam cheese wheel" desc = "A wheel of mild edam cheese." icon_state = "cheesewheel-edam" - slice_path = /obj/item/food/cheesewedge/edam + slice_path = /obj/item/food/slice/cheesewedge/edam slices_num = 4 list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15) tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2) -/obj/item/food/cheesewedge/edam +/obj/item/food/slice/cheesewedge/edam name = "edam cheese wedge" desc = "A wedge of mild edam cheese. It's said to have a nutty flavor." icon_state = "cheesewedge-edam" @@ -88,12 +88,12 @@ name = "blue cheese wheel" desc = "A wheel of pungent blue cheese. It's an acquired taste..." icon_state = "cheesewheel-blue" - slice_path = /obj/item/food/cheesewedge/blue + slice_path = /obj/item/food/slice/cheesewedge/blue slices_num = 5 list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 10) tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1) -/obj/item/food/cheesewedge/blue +/obj/item/food/slice/cheesewedge/blue name = "blue cheese wedge" desc = "A wedge of pungent blue cheese. The flavor is... intense." icon_state = "cheesewedge-blue" @@ -104,24 +104,24 @@ name = "camembert cheese wheel" desc = "A miniature wheel of gooey camembert. Yum..." icon_state = "cheesewheel-camembert" - slice_path = /obj/item/food/cheesewedge/camembert + slice_path = /obj/item/food/slice/cheesewedge/camembert slices_num = 2 list_reagents = list("nutriment" = 1, "vitamin" = 2, "cheese" = 6) tastes = list("mild cheese" = 3, "gooeyness" = 1) -/obj/item/food/cheesewedge/camembert +/obj/item/food/slice/cheesewedge/camembert name = "camembert cheese slice" desc = "A piece of camembert. It's soft and gooey." icon_state = "cheesewedge-camembert" bitesize = 2 tastes = list("mild cheese" = 3, "gooeyness" = 1) -/obj/item/food/cheesewedge/checkpass(passflag) +/obj/item/food/slice/cheesewedge/checkpass(passflag) if((passflag & PASSDOOR) && ismouse(pulledby)) return TRUE return ..() -/obj/item/food/cheesewedge/presliced +/obj/item/food/slice/cheesewedge/presliced list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4) /obj/item/food/weirdcheesewedge @@ -151,14 +151,14 @@ list_reagents = list("plantmatter" = 3, "vitamin" = 1) tastes = list("mushroom" = 1) -/obj/item/food/watermelonslice +/obj/item/food/slice/watermelon name = "watermelon slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#FF3867" tastes = list("watermelon" = 1) -/obj/item/food/tomatoslice +/obj/item/food/slice/tomato name = "tomato slice" desc = "A fresh slice of tomato." icon_state = "tomatoslice" @@ -166,7 +166,7 @@ list_reagents = list("plantmatter" = 2) tastes = list("tomato" = 1) -/obj/item/food/pineappleslice +/obj/item/food/slice/pineapple name = "pineapple slices" desc = "Rings of pineapple." icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. @@ -204,13 +204,13 @@ desc = "Some flattened dough." icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "flat dough" - slice_path = /obj/item/food/doughslice + slice_path = /obj/item/food/slice/dough slices_num = 3 list_reagents = list("nutriment" = 6) tastes = list("dough" = 1) -/obj/item/food/doughslice +/obj/item/food/slice/dough name = "dough slice" desc = "The building block of an impressive dish." icon = 'icons/obj/food/food_ingredients.dmi' diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index 022d0dc6fa09..7ce680024a54 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -564,13 +564,13 @@ desc = "A traditional turkey served with stuffing." icon = 'icons/obj/food/meat.dmi' icon_state = "turkey" - slice_path = /obj/item/food/turkeyslice + slice_path = /obj/item/food/slice/turkey slices_num = 6 list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5) tastes = list("turkey" = 2, "stuffing" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/turkeyslice +/obj/item/food/slice/turkey name = "turkey serving" desc = "A serving of some tender and delicious turkey." icon = 'icons/obj/food/meat.dmi' diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index ea384ed02fe4..044fd036ec0e 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -14,11 +14,11 @@ name = "margherita pizza" desc = "The golden standard of pizzas." icon_state = "margheritapizza" - slice_path = /obj/item/food/margheritapizzaslice + slice_path = /obj/item/food/slice/margherita_pizza list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/margheritapizzaslice +/obj/item/food/slice/margherita_pizza name = "margherita slice" desc = "A slice of the classic pizza." icon = 'icons/obj/food/pizza.dmi' @@ -32,12 +32,12 @@ name = "meat pizza" desc = "A pizza with meat topping." icon_state = "meatpizza" - slice_path = /obj/item/food/meatpizzaslice + slice_path = /obj/item/food/slice/meat_pizza list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) tastes = list("crust" = 1, "cheese" = 1, "meat" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/meatpizzaslice +/obj/item/food/slice/meat_pizza name = "meat pizza slice" desc = "A slice of a meaty pizza." icon = 'icons/obj/food/pizza.dmi' @@ -51,12 +51,12 @@ name = "mushroom pizza" desc = "Very special pizza." icon_state = "mushroompizza" - slice_path = /obj/item/food/mushroompizzaslice + slice_path = /obj/item/food/slice/mushroom_pizza list_reagents = list("plantmatter" = 30, "vitamin" = 5) tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/mushroompizzaslice +/obj/item/food/slice/mushroom_pizza name = "mushroom pizza slice" desc = "Maybe it is the last slice of pizza in your life." icon = 'icons/obj/food/pizza.dmi' @@ -70,12 +70,12 @@ name = "vegetable pizza" desc = "No Tomato Sapiens were harmed during the making of this pizza." icon_state = "vegetablepizza" - slice_path = /obj/item/food/vegetablepizzaslice + slice_path = /obj/item/food/slice/vegetable_pizza list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/vegetablepizzaslice +/obj/item/food/slice/vegetable_pizza name = "vegetable pizza slice" desc = "A slice of the most green pizza of all pizzas not containing green ingredients." icon = 'icons/obj/food/pizza.dmi' @@ -89,12 +89,12 @@ name = "hawaiian pizza" desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple." icon_state = "hawaiianpizza" - slice_path = /obj/item/food/hawaiianpizzaslice + slice_path = /obj/item/food/slice/hawaiian_pizza list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5) tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/hawaiianpizzaslice +/obj/item/food/slice/hawaiian_pizza name = "hawaiian pizza slice" desc = "A slice of polarising pizza." icon = 'icons/obj/food/pizza.dmi' @@ -108,13 +108,13 @@ name = "mac 'n' cheese pizza" desc = "Gastronomists have yet to classify this dish as 'pizza'." icon_state = "macpizza" - slice_path = /obj/item/food/macpizzaslice + slice_path = /obj/item/food/slice/mac_pizza list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious filling_color = "#ffe45d" tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/macpizzaslice +/obj/item/food/slice/mac_pizza name = "mac 'n' cheese pizza slice" desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!" icon = 'icons/obj/food/pizza.dmi' @@ -128,13 +128,13 @@ name = "pepperoni pizza" desc = "What did the pepperoni say to the pizza?" icon_state = "pepperonipizza" - slice_path = /obj/item/food/pepperonipizzaslice + slice_path = /obj/item/food/slice/pepperoni_pizza list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) filling_color = "#ffe45d" tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/pepperonipizzaslice +/obj/item/food/slice/pepperoni_pizza name = "pepperoni pizza slice" desc = "Nice to meat you!" icon = 'icons/obj/food/pizza.dmi' @@ -148,11 +148,11 @@ name = "cheese pizza" desc = "Cheese, bread, cheese, tomato, and cheese." icon_state = "cheesepizza" - slice_path = /obj/item/food/cheesepizzaslice + slice_path = /obj/item/food/slice/cheese_pizza list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/cheesepizzaslice +/obj/item/food/slice/cheese_pizza name = "cheese pizza slice" desc = "Dangerously cheesy?" icon = 'icons/obj/food/pizza.dmi' @@ -166,12 +166,12 @@ name = "donk-pocket pizza" desc = "Who thought this would be a good idea?" icon_state = "donkpocketpizza" - slice_path = /obj/item/food/donkpocketpizzaslice + slice_path = /obj/item/food/slice/donk_pocket_pizza list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6) tastes = list("crust" = 1, "meat" = 1, "laziness" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/donkpocketpizzaslice +/obj/item/food/slice/donk_pocket_pizza name = "donk-pocket pizza slice" desc = "Smells like lukewarm donk-pocket." icon = 'icons/obj/food/pizza.dmi' @@ -185,12 +185,12 @@ name = "dank pizza" desc = "The hippie's pizza of choice." icon_state = "dankpizza" - slice_path = /obj/item/food/dankpizzaslice + slice_path = /obj/item/food/slice/dank_pizza list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6) tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/dankpizzaslice +/obj/item/food/slice/dank_pizza name = "dank pizza slice" desc = "So good, man..." icon = 'icons/obj/food/pizza.dmi' @@ -204,12 +204,12 @@ name = "firecracker pizza" desc = "Tastes HOT HOT HOT!" icon_state = "firecrackerpizza" - slice_path = /obj/item/food/firecrackerpizzaslice + slice_path = /obj/item/food/slice/fire_cracker_pizza list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12) tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/firecrackerpizzaslice +/obj/item/food/slice/fire_cracker_pizza name = "firecracker pizza slice" desc = "A spicy slice of something quite nice." icon = 'icons/obj/food/pizza.dmi' @@ -223,12 +223,12 @@ name = "\"pesto\" pizza" desc = "Wait a second...this doesn't taste like pesto!" icon_state = "pestopizza" - slice_path = /obj/item/food/pestopizzaslice + slice_path = /obj/item/food/slice/pesto_pizza list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12) tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/pestopizzaslice +/obj/item/food/slice/pesto_pizza name = "\"pesto\" pizza slice" desc = "Delicious and suspicious(ly green)." icon = 'icons/obj/food/pizza.dmi' @@ -242,12 +242,12 @@ name = "garlic pizza" desc = "Ahh, garlic. A universally loved ingredient, except possibly by vampires." icon_state = "garlicpizza" - slice_path = /obj/item/food/garlicpizzaslice + slice_path = /obj/item/food/garlic_pizza list_reagents = list("plantmatter" = 30, "vitamin" = 5, "garlic" = 12) tastes = list("crust" = 1, "cheese" = 1, "garlic" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/garlicpizzaslice +/obj/item/food/garlic_pizza name = "garlic pizza slice" desc = "What's not to love?" icon = 'icons/obj/food/pizza.dmi' diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm index a381e3ae20be..71302ad591c0 100644 --- a/code/modules/food_and_drinks/food/foods/seafood.dm +++ b/code/modules/food_and_drinks/food/foods/seafood.dm @@ -188,14 +188,14 @@ desc = "A large unsliced roll of Sake Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Sake_maki" - slice_path = /obj/item/food/sushi_sake + slice_path = /obj/item/food/slice/sushi_sake slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_sake +/obj/item/food/slice/sushi_sake name = "sake sushi" desc = "A simple sushi consisting of raw salmon and rice." icon = 'icons/obj/food/seafood.dmi' @@ -210,14 +210,14 @@ desc = "A large unsliced roll of Smoked Salmon Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "SmokedSalmon_maki" - slice_path = /obj/item/food/sushi_smoked_salmon + slice_path = /obj/item/food/slice/sushi_smoked_salmon slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_smoked_salmon +/obj/item/food/slice/sushi_smoked_salmon name = "smoked salmon sushi" desc = "A simple sushi consisting of cooked salmon and rice." icon = 'icons/obj/food/seafood.dmi' @@ -232,14 +232,14 @@ desc = "A large unsliced roll of Tamago Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Tamago_maki" - slice_path = /obj/item/food/sushi_tamago + slice_path = /obj/item/food/slice/sushi_tamago slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_tamago +/obj/item/food/slice/sushi_tamago name = "tamago sushi" desc = "A simple sushi consisting of egg and rice." icon = 'icons/obj/food/seafood.dmi' @@ -254,14 +254,14 @@ desc = "A large unsliced roll of Inari Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Inari_maki" - slice_path = /obj/item/food/sushi_inari + slice_path = /obj/item/food/slice/sushi_inari slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_inari +/obj/item/food/slice/sushi_inari name = "inari sushi" desc = "A piece of fried tofu stuffed with rice." icon = 'icons/obj/food/seafood.dmi' @@ -276,14 +276,14 @@ desc = "A large unsliced roll of Masago Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Masago_maki" - slice_path = /obj/item/food/sushi_masago + slice_path = /obj/item/food/slice/sushi_masago slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_masago +/obj/item/food/slice/sushi_masago name = "masago sushi" desc = "A simple sushi consisting of goldfish roe." icon = 'icons/obj/food/seafood.dmi' @@ -298,14 +298,14 @@ desc = "A large unsliced roll of Tobkio Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Tobiko_maki" - slice_path = /obj/item/food/sushi_tobiko + slice_path = /obj/item/food/slice/sushi_tobiko slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_tobiko +/obj/item/food/slice/sushi_tobiko name = "tobiko sushi" desc = "A simple sushi consisting of shark roe." icon = 'icons/obj/food/seafood.dmi' @@ -320,14 +320,14 @@ desc = "A large unsliced roll of Tobkio and Egg Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "TobikoEgg_maki" - slice_path = /obj/item/food/sushi_tobiko_egg + slice_path = /obj/item/food/slice/sushi_tobiko_egg slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_tobiko_egg +/obj/item/food/slice/sushi_tobiko_egg name = "tobiko and egg sushi" desc = "A sushi consisting of shark roe and an egg." icon = 'icons/obj/food/seafood.dmi' @@ -342,14 +342,14 @@ desc = "A large unsliced roll of Tai Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Tai_maki" - slice_path = /obj/item/food/sushi_tai + slice_path = /obj/item/food/slice/sushi_tai slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/sushi_tai +/obj/item/food/slice/sushi_tai name = "tai sushi" desc = "A simple sushi consisting of catfish and rice." icon = 'icons/obj/food/seafood.dmi' diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index d7674e34464b..a069cf1679f1 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -4,6 +4,7 @@ #define MAX_WEIGHT_CLASS WEIGHT_CLASS_SMALL +//MARK: FOOD /obj/item/food name = "snack" desc = "yummy!" @@ -40,13 +41,13 @@ var/goal_difficulty = FOOD_GOAL_SKIP var/bitecount = 0 - var/trash = null + var/trash var/slice_path var/slices_num - var/dried_type = null + var/dried_type var/dry = FALSE var/cooktype[0] - var/cooked_type = null //for microwave cooking. path of the resulting item after microwaving + var/cooked_type //for microwave cooking. path of the resulting item after microwaving var/total_w_class = 0 //for the total weight an item of food can carry var/list/tastes // for example list("crisps" = 2, "salt" = 1) @@ -274,9 +275,25 @@ W.taste(reagents) W.consume(src) +//MARK: SLICE +/obj/item/food/slice + var/test = 3 + +/obj/item/food/slice/Initialize(mapload, var/list/parent_reagents) + if(!parent_reagents) + log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") + list_reagents = parent_reagents + return ..() + +//MARK: SLICEABLE /obj/item/food/sliceable slices_num = 2 +/obj/item/food/sliceable/Initialize(mapload) + if(!istype(slice_path, /obj/item/food/slice)) + CRASH("Invalid type assigned to slice_path: [slice_path]") + return ..() + /obj/item/food/sliceable/examine(mob/user) . = ..() . += "Alt-click to put something small inside." @@ -334,8 +351,10 @@ slices_lost = rand(1, min(1, round(slices_num / 2))) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i in 1 to (slices_num - slices_lost)) - var/obj/slice = new slice_path (loc) - reagents.trans_to(slice,reagents_per_slice) + if(!istype(slice_path, /obj/item/food/slice)) + CRASH("Invalid type assigned to slice_path: [slice_path]") + return + var/obj/item/food/slice/slice = new slice_path (loc,reagents_per_slice) slice.pixel_x = rand(-7, 7) slice.pixel_y = rand(-7, 7) qdel(src) @@ -354,8 +373,7 @@ cooktype["grilled"] = TRUE cooktype["deep fried"] = TRUE -// MISC - +//MARK: MISC /obj/item/food/cereal name = "box of cereal" desc = "A box of cereal." diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index f070d09d2905..2864dbc21c95 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -189,7 +189,7 @@ output = /obj/item/food/carrotfries /datum/deepfryer_special/onionrings - input = /obj/item/food/onion_slice + input = /obj/item/food/slice/onion_slice output = /obj/item/food/onionrings /datum/deepfryer_special/fried_vox diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 63608f5fe394..5f0337466d0b 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -105,7 +105,7 @@ output = /obj/item/food/soydope /datum/food_processor_process/spaghetti - input = /obj/item/food/doughslice + input = /obj/item/food/slice/dough output = /obj/item/food/spaghetti /datum/food_processor_process/macaroni diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm index e3ab57ad8ab9..69aba58789fc 100644 --- a/code/modules/food_and_drinks/recipes/recipes_candy.dm +++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm @@ -90,7 +90,7 @@ /datum/recipe/candy/candied_pineapple reagents = list("sugar" = 2, "water" = 2) items = list( - /obj/item/food/pineappleslice + /obj/item/food/slice/pineapple ) result = /obj/item/food/candy/candied_pineapple diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm index d984f12eb9b5..1bca7fd7df7f 100644 --- a/code/modules/food_and_drinks/recipes/recipes_grill.dm +++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm @@ -75,9 +75,9 @@ /datum/recipe/grill/grilledcheese items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice, - /obj/item/food/cheesewedge + /obj/item/food/slice/bread, + /obj/item/food/slice/bread, + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/grilledcheese @@ -112,8 +112,8 @@ items = list( /obj/item/food/egg, /obj/item/food/egg, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/omelette @@ -179,7 +179,7 @@ /obj/item/food/boiledrice, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_tamago + result = /obj/item/food/slice/sushi_tamago /datum/recipe/grill/sushi_unagi reagents = list("sake" = 5) @@ -212,7 +212,7 @@ /obj/item/food/fried_tofu, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_inari + result = /obj/item/food/slice/sushi_inari /datum/recipe/grill/sushi_sake items = list( @@ -220,7 +220,7 @@ /obj/item/food/salmonmeat, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_sake + result = /obj/item/food/slice/sushi_sake /datum/recipe/grill/sushi_smoked_salmon items = list( @@ -228,7 +228,7 @@ /obj/item/food/salmonsteak, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_smoked_salmon + result = /obj/item/food/slice/sushi_smoked_salmon /datum/recipe/grill/sushi_masago items = list( @@ -236,7 +236,7 @@ /obj/item/fish_eggs/goldfish, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_masago + result = /obj/item/food/slice/sushi_masago /datum/recipe/grill/sushi_tobiko items = list( @@ -244,15 +244,15 @@ /obj/item/fish_eggs/shark, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_tobiko + result = /obj/item/food/slice/sushi_tobiko /datum/recipe/grill/sushi_tobiko_egg items = list( - /obj/item/food/sushi_tobiko, + /obj/item/food/slice/sushi_tobiko, /obj/item/food/egg, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_tobiko_egg + result = /obj/item/food/slice/sushi_tobiko_egg /datum/recipe/grill/sushi_tai items = list( @@ -260,7 +260,7 @@ /obj/item/food/catfishmeat, /obj/item/stack/seaweed ) - result = /obj/item/food/sushi_tai + result = /obj/item/food/slice/sushi_tai /datum/recipe/grill/goliath items = list(/obj/item/food/monstermeat/goliath) diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index b97d66f76192..9e703170ab52 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -330,7 +330,7 @@ /obj/item/food/meat, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/burger/bigbite @@ -340,9 +340,9 @@ /obj/item/food/burger/bigbite, /obj/item/food/dough, /obj/item/food/meat, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/bacon, - /obj/item/food/tomatoslice + /obj/item/food/slice/tomato ) result = /obj/item/food/burger/superbite @@ -419,7 +419,7 @@ /obj/item/food/bun, /obj/item/food/meat, /obj/item/food/grown/lettuce, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/burger/cheese @@ -459,7 +459,7 @@ /obj/item/food/bacon, /obj/item/food/bacon, /obj/item/food/grown/lettuce, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/burger/bacon @@ -467,7 +467,7 @@ items = list( /obj/item/food/bun, /obj/item/food/bbqribs, - /obj/item/food/onion_slice + /obj/item/food/slice/onion_slice ) result = /obj/item/food/burger/mcrib @@ -510,8 +510,8 @@ /datum/recipe/microwave/eggplantparm items = list( - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/eggplant ) result = /obj/item/food/eggplantparm @@ -541,7 +541,7 @@ /datum/recipe/microwave/cheesyfries items = list( /obj/item/food/fries, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/cheesyfries @@ -656,7 +656,7 @@ items = list( /obj/item/food/cutlet, /obj/item/food/beans, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/sliceable/flatdough ) result = /obj/item/food/burrito @@ -684,9 +684,9 @@ /datum/recipe/microwave/sandwich items = list( /obj/item/food/meatsteak, - /obj/item/food/breadslice, - /obj/item/food/breadslice, - /obj/item/food/cheesewedge + /obj/item/food/slice/bread, + /obj/item/food/slice/bread, + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/sandwich @@ -713,14 +713,14 @@ /datum/recipe/microwave/slimetoast reagents = list("slimejelly" = 5) items = list( - /obj/item/food/breadslice, + /obj/item/food/slice/bread, ) result = /obj/item/food/jelliedtoast/slime /datum/recipe/microwave/jelliedtoast reagents = list("cherryjelly" = 5) items = list( - /obj/item/food/breadslice + /obj/item/food/slice/bread ) result = /obj/item/food/jelliedtoast/cherry @@ -797,7 +797,7 @@ /datum/recipe/microwave/macncheese reagents = list("water" = 5, "milk" = 5) items = list( - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/macaroni, ) result = /obj/item/food/macncheese @@ -808,8 +808,8 @@ /obj/item/food/bun, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/lettuce, /obj/item/food/grown/chili, /obj/item/toy/crayon/green, @@ -819,10 +819,10 @@ /datum/recipe/microwave/blt items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice, + /obj/item/food/slice/bread, + /obj/item/food/slice/bread, /obj/item/food/grown/lettuce, - /obj/item/food/tomatoslice, + /obj/item/food/slice/tomato, /obj/item/food/bacon ) result = /obj/item/food/blt @@ -830,34 +830,34 @@ /datum/recipe/microwave/peanut_butter_jelly/cherry reagents = list("cherryjelly" = 5, "peanutbutter" = 5) items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice + /obj/item/food/slice/bread, + /obj/item/food/slice/bread ) result = /obj/item/food/peanut_butter_jelly/cherry /datum/recipe/microwave/peanut_butter_jelly/slime reagents = list("slimejelly" = 5, "peanutbutter" = 5) items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice + /obj/item/food/slice/bread, + /obj/item/food/slice/bread ) result = /obj/item/food/peanut_butter_jelly/slime /datum/recipe/microwave/peanut_butter_banana reagents = list("peanutbutter" = 5) items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice, + /obj/item/food/slice/bread, + /obj/item/food/slice/bread, /obj/item/food/grown/banana ) result = /obj/item/food/peanut_butter_banana /datum/recipe/microwave/philly_cheesesteak items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice, + /obj/item/food/slice/bread, + /obj/item/food/slice/bread, /obj/item/food/cutlet, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/onion ) result = /obj/item/food/philly_cheesesteak @@ -967,24 +967,24 @@ /datum/recipe/microwave/twobread reagents = list("wine" = 5) items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice + /obj/item/food/slice/bread, + /obj/item/food/slice/bread ) result = /obj/item/food/twobread /datum/recipe/microwave/slimesandwich reagents = list("slimejelly" = 5) items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice + /obj/item/food/slice/bread, + /obj/item/food/slice/bread ) result = /obj/item/food/jellysandwich/slime /datum/recipe/microwave/cherrysandwich reagents = list("cherryjelly" = 5) items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice + /obj/item/food/slice/bread, + /obj/item/food/slice/bread ) result = /obj/item/food/jellysandwich/cherry @@ -1049,7 +1049,7 @@ reagents = list("water" = 10) items = list( /obj/item/food/grown/onion, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/soup/frenchonionsoup @@ -1179,7 +1179,7 @@ /obj/item/food/badrecipe, /obj/item/food/tofu, /obj/item/food/egg, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/soup/mysterysoup @@ -1220,7 +1220,7 @@ /obj/item/food/grown/olive, /obj/item/food/grown/tomato, /obj/item/food/cutlet, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/salad/antipasto @@ -1228,9 +1228,9 @@ reagents = list("oliveoil" = 5) items = list( /obj/item/food/grown/lettuce, - /obj/item/food/onion_slice/red, - /obj/item/food/cheesewedge, - /obj/item/food/breadslice + /obj/item/food/slice/onion_slice/red, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/bread ) result = /obj/item/food/salad/caesar @@ -1247,7 +1247,7 @@ /obj/item/food/grown/citrus/orange, /obj/item/food/grown/apple, /obj/item/food/grown/grapes, - /obj/item/food/watermelonslice + /obj/item/food/slice/watermelon ) result = /obj/item/food/salad/fruit @@ -1256,10 +1256,10 @@ items = list( /obj/item/food/grown/olive, /obj/item/food/grown/tomato, - /obj/item/food/onion_slice/red, - /obj/item/food/onion_slice/red, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge + /obj/item/food/slice/onion_slice/red, + /obj/item/food/slice/onion_slice/red, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/salad/greek @@ -1269,8 +1269,8 @@ /obj/item/food/grown/grapes, /obj/item/food/grown/banana, /obj/item/food/grown/banana, - /obj/item/food/watermelonslice, - /obj/item/food/watermelonslice + /obj/item/food/slice/watermelon, + /obj/item/food/slice/watermelon ) result = /obj/item/food/salad/jungle @@ -1279,8 +1279,8 @@ items = list( /obj/item/food/grown/carrot, /obj/item/food/grown/lettuce, - /obj/item/food/onion_slice/red, - /obj/item/food/onion_slice/red + /obj/item/food/slice/onion_slice/red, + /obj/item/food/slice/onion_slice/red ) result = /obj/item/food/salad/kale @@ -1365,7 +1365,7 @@ items = list( /obj/item/food/friedegg, /obj/item/food/meatsteak, - /obj/item/food/breadslice + /obj/item/food/slice/bread ) result = /obj/item/food/benedict @@ -1474,7 +1474,7 @@ /datum/recipe/microwave/frozenpineapplepop items = list( /obj/item/popsicle_stick, - /obj/item/food/pineappleslice, + /obj/item/food/slice/pineapple, /obj/item/food/chocolatebar ) result = /obj/item/food/frozen/popsicle/frozenpineapple @@ -1647,8 +1647,8 @@ /datum/recipe/microwave/notasandwich items = list( - /obj/item/food/breadslice, - /obj/item/food/breadslice, + /obj/item/food/slice/bread, + /obj/item/food/slice/bread, /obj/item/clothing/mask/fakemoustache ) result = /obj/item/food/notasandwich @@ -1720,9 +1720,9 @@ /datum/recipe/microwave/taco items = list( - /obj/item/food/doughslice, + /obj/item/food/slice/dough, /obj/item/food/cutlet, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/taco diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 9012cba58c60..8fcaa46f1b6c 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -16,9 +16,9 @@ /obj/item/food/meat, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, ) result = /obj/item/food/sliceable/meatbread @@ -30,9 +30,9 @@ /obj/item/food/meat/syntiflesh, /obj/item/food/meat/syntiflesh, /obj/item/food/meat/syntiflesh, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, ) result = /obj/item/food/sliceable/meatbread @@ -44,9 +44,9 @@ /obj/item/food/monstermeat/xenomeat, /obj/item/food/monstermeat/xenomeat, /obj/item/food/monstermeat/xenomeat, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, ) result = /obj/item/food/sliceable/xenomeatbread @@ -241,8 +241,8 @@ /obj/item/food/dough, /obj/item/food/dough, /obj/item/food/dough, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, ) result = /obj/item/food/sliceable/cheesecake @@ -444,15 +444,15 @@ /obj/item/food/tofu, /obj/item/food/tofu, /obj/item/food/tofu, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, ) result = /obj/item/food/sliceable/tofubread /datum/recipe/oven/loadedbakedpotato items = list( - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/potato ) result = /obj/item/food/loadedbakedpotato @@ -483,7 +483,7 @@ /datum/recipe/oven/fortunecookie reagents = list("sugar" = 5) items = list( - /obj/item/food/doughslice, + /obj/item/food/slice/dough, /obj/item/paper, ) result = /obj/item/food/fortunecookie @@ -505,8 +505,8 @@ /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/sliceable/pizza/margheritapizza @@ -516,7 +516,7 @@ /obj/item/food/meat, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/tomato ) result = /obj/item/food/sliceable/pizza/meatpizza @@ -524,7 +524,7 @@ /datum/recipe/oven/mushroompizza items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/mushroom, /obj/item/food/grown/mushroom, /obj/item/food/grown/mushroom, @@ -537,7 +537,7 @@ /datum/recipe/oven/vegetablepizza items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/eggplant, /obj/item/food/grown/carrot, /obj/item/food/grown/corn, @@ -549,9 +549,9 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge, - /obj/item/food/pineappleslice, - /obj/item/food/pineappleslice, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/pineapple, + /obj/item/food/slice/pineapple, /obj/item/food/meat, ) result = /obj/item/food/sliceable/pizza/hawaiianpizza @@ -559,8 +559,8 @@ /datum/recipe/oven/macncheesepizza items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/macncheese, ) result = /obj/item/food/sliceable/pizza/macpizza @@ -569,10 +569,10 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/sliceable/pizza/cheesepizza @@ -580,7 +580,7 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/sausage ) result = /obj/item/food/sliceable/pizza/pepperonipizza @@ -589,7 +589,7 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/donkpocket, /obj/item/food/donkpocket ) @@ -599,7 +599,7 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/cannabis, /obj/item/food/grown/cannabis, /obj/item/food/grown/cannabis, @@ -611,7 +611,7 @@ reagents = list("capsaicin" = 5) items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/chili, /obj/item/food/grown/chili ) @@ -623,7 +623,7 @@ /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/sliceable/pizza/pestopizza @@ -633,7 +633,7 @@ /obj/item/food/sliceable/flatdough, /obj/item/food/grown/garlic, /obj/item/food/grown/garlic, - /obj/item/food/cheesewedge + /obj/item/food/slice/cheesewedge ) result = /obj/item/food/sliceable/pizza/garlicpizza @@ -662,8 +662,8 @@ items = list( /obj/item/food/dough, /obj/item/food/dough, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, ) result = /obj/item/food/sliceable/creamcheesebread @@ -814,7 +814,7 @@ /datum/recipe/oven/cracker reagents = list("sodiumchloride" = 1) items = list( - /obj/item/food/doughslice + /obj/item/food/slice/dough ) result = /obj/item/food/cracker @@ -859,9 +859,9 @@ items = list( /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, - /obj/item/food/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, + /obj/item/food/slice/cheesewedge, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, /obj/item/food/dough diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm index 1fe1c90adec0..613b2e96934d 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm @@ -2,8 +2,8 @@ name = "Sandwich" reqs = list( /obj/item/food/meatsteak = 1, - /obj/item/food/breadslice = 2, - /obj/item/food/cheesewedge = 1, + /obj/item/food/slice/bread = 2, + /obj/item/food/slice/cheesewedge = 1, ) result = list(/obj/item/food/sandwich) category = CAT_FOOD @@ -13,7 +13,7 @@ name = "Slime Jelly Sandwich" reqs = list( /datum/reagent/slimejelly = 5, - /obj/item/food/breadslice = 2, + /obj/item/food/slice/bread = 2, ) result = list(/obj/item/food/jellysandwich/slime) category = CAT_FOOD @@ -23,7 +23,7 @@ name = "Cherry Jelly Sandwich" reqs = list( /datum/reagent/consumable/cherryjelly = 5, - /obj/item/food/breadslice = 2, + /obj/item/food/slice/bread = 2, ) result = list(/obj/item/food/jellysandwich/cherry) category = CAT_FOOD @@ -62,7 +62,7 @@ /datum/crafting_recipe/notasandwich name = "not-a-sandwich" reqs = list( - /obj/item/food/breadslice = 2, + /obj/item/food/slice/bread = 2, /obj/item/clothing/mask/fakemoustache = 1, ) result = list(/obj/item/food/notasandwich) @@ -122,7 +122,7 @@ /obj/item/food/fried_tofu = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_inari) + result = list(/obj/item/food/slice/sushi_inari) category = CAT_FOOD subcategory = CAT_SUSHI @@ -145,7 +145,7 @@ /obj/item/food/salmonmeat = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_sake) + result = list(/obj/item/food/slice/sushi_sake) category = CAT_FOOD subcategory = CAT_SUSHI @@ -168,7 +168,7 @@ /obj/item/food/salmonsteak = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_smoked_salmon) + result = list(/obj/item/food/slice/sushi_smoked_salmon) category = CAT_FOOD subcategory = CAT_SUSHI @@ -191,7 +191,7 @@ /obj/item/fish_eggs/goldfish = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_masago) + result = list(/obj/item/food/slice/sushi_masago) category = CAT_FOOD subcategory = CAT_SUSHI @@ -214,7 +214,7 @@ /obj/item/fish_eggs/shark = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_tobiko) + result = list(/obj/item/food/slice/sushi_tobiko) category = CAT_FOOD subcategory = CAT_SUSHI @@ -233,18 +233,18 @@ /datum/crafting_recipe/sushi_tobiko_egg name = "Tobiko and Egg Sushi" reqs = list( - /obj/item/food/sushi_tobiko = 1, + /obj/item/food/slice/sushi_tobiko = 1, /obj/item/food/egg = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_tobiko_egg) + result = list(/obj/item/food/slice/sushi_tobiko_egg) category = CAT_FOOD subcategory = CAT_SUSHI /datum/crafting_recipe/tobiko_egg_maki name = "Tobiko and Egg Maki Roll" reqs = list( - /obj/item/food/sushi_tobiko = 4, + /obj/item/food/slice/sushi_tobiko = 4, /obj/item/food/egg = 4, /obj/item/stack/seaweed = 1, ) @@ -260,7 +260,7 @@ /obj/item/food/catfishmeat = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/sushi_tai) + result = list(/obj/item/food/slice/sushi_tai) category = CAT_FOOD subcategory = CAT_SUSHI diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 9d6ef0044708..382ce981ef84 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -26,7 +26,7 @@ name = "watermelon" desc = "It's full of watery goodness." icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. - slice_path = /obj/item/food/watermelonslice + slice_path = /obj/item/food/slice/watermelon slices_num = 5 dried_type = null w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 3e4532713ea9..07ae79edf1a9 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -23,7 +23,7 @@ icon_state = "onion" filling_color = "#C0C9A0" bitesize_mod = 2 - slice_path = /obj/item/food/onion_slice + slice_path = /obj/item/food/slice/onion_slice tastes = list("onion" = 1, "pungentness" = 1) slices_num = 2 wine_power = 0.3 @@ -46,12 +46,12 @@ desc = "Purple despite the name." icon_state = "onion_red" filling_color = "#C29ACF" - slice_path = /obj/item/food/onion_slice/red + slice_path = /obj/item/food/slice/onion_slice/red tastes = list("red onion" = 1, "pungentness" = 3) wine_power = 0.6 wine_flavor = "powerful pungentness" -/obj/item/food/onion_slice +/obj/item/food/slice/onion_slice name = "onion slices" desc = "Rings, not for wearing." icon_state = "onionslice" @@ -61,7 +61,7 @@ gender = PLURAL cooked_type = /obj/item/food/onionrings -/obj/item/food/onion_slice/red +/obj/item/food/slice/onion_slice/red name = "red onion slices" desc = "They shine like exceptionally low quality amethyst." icon_state = "onionslice_red" diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index 3935ae7ae7e6..b8e06e7d0f2c 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -25,7 +25,7 @@ attack_verb = list("stung", "pined") throw_speed = 1 throw_range = 5 - slice_path = /obj/item/food/pineappleslice + slice_path = /obj/item/food/slice/pineapple slices_num = 3 filling_color = "#F6CB0B" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 355e0bce240c..ec92c2ef971b 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -19,7 +19,7 @@ name = "tomato" desc = "I say to-mah-to, you say tom-mae-to." icon_state = "tomato" - slice_path = /obj/item/food/tomatoslice + slice_path = /obj/item/food/slice/tomato slices_num = 4 splat_type = /obj/effect/decal/cleanable/tomato_smudge filling_color = "#FF6347" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index 430ce7d223d3..a37052c75e27 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -235,7 +235,7 @@ butcher_results = list( /obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, - /obj/item/food/birthdaycakeslice = 3, + /obj/item/food/slice/birthday_cake = 3, /obj/item/food/meat/slab = 2 ) response_harm = "takes a bite out of" diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index ec8c6b06ee1d..681117d1e4a0 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -100,7 +100,7 @@ ..() /mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things - if(istype(AM, /obj/item/food/cheesewedge)) + if(istype(AM, /obj/item/food/slice/cheesewedge)) return ..() // Get dem if(show_message) to_chat(src, "You are too small to pull anything except cheese.") diff --git a/code/modules/projectiles/guns/chaos_bolt.dm b/code/modules/projectiles/guns/chaos_bolt.dm index cd197bd82757..3b74aa5b5e90 100644 --- a/code/modules/projectiles/guns/chaos_bolt.dm +++ b/code/modules/projectiles/guns/chaos_bolt.dm @@ -148,7 +148,7 @@ explosion(get_turf(H), 1, 1, 1, cause = "staff of chaos lethal explosion effect") if("cheese morphed") H.visible_message("[H] transforms into cheese!", "You've been transformed into cheese!") - new /obj/item/food/cheesewedge(get_turf(H)) + new /obj/item/food/slice/cheesewedge(get_turf(H)) qdel(H) if("supermattered") var/obj/machinery/atmospherics/supermatter_crystal/supercrystal = GLOB.main_supermatter_engine @@ -323,7 +323,7 @@ if("toy revolver") item_to_summon = /obj/item/gun/projectile/revolver/capgun/chaosprank if("cheese") - item_to_summon = /obj/item/food/cheesewedge + item_to_summon = /obj/item/food/slice/cheesewedge explosion_amount = rand(5, 10) if("food") target.visible_message("Food scatters around [target]!", "A bunch of food scatters around you!") diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index 77cbb7b36112..c37b3c7e58c3 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -70,7 +70,7 @@ /obj/item/food/grown/citrus/orange = list("orangejuice" = 0), /obj/item/food/grown/citrus/lime = list("limejuice" = 0), /obj/item/food/grown/watermelon = list("watermelonjuice" = 0), - /obj/item/food/watermelonslice = list("watermelonjuice" = 0), + /obj/item/food/slice/watermelon = list("watermelonjuice" = 0), /obj/item/food/grown/berries/poison = list("poisonberryjuice" = 0), /obj/item/food/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), // Order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice /obj/item/food/grown/pumpkin = list("pumpkinjuice" = 0), diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index c4c52e2c4d6d..5146bcb64ec5 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -635,7 +635,7 @@ /datum/reagent/consumable/cheese/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/item/food/cheesewedge(T) + new /obj/item/food/slice/cheesewedge(T) /datum/reagent/consumable/fake_cheese name = "Cheese substitute" @@ -925,7 +925,7 @@ /datum/reagent/consumable/bread/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/item/food/breadslice(T) + new /obj/item/food/slice/bread(T) /datum/reagent/soap name = "Soap" diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index b2f83faccacf..1f6a655edad9 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -150,21 +150,21 @@ var/list/blocked = list( /obj/item/food, - /obj/item/food/breadslice, + /obj/item/food/slice/bread, /obj/item/food/sliceable, /obj/item/food/sliceable/pizza, - /obj/item/food/margheritapizzaslice, - /obj/item/food/meatpizzaslice, - /obj/item/food/mushroompizzaslice, - /obj/item/food/vegetablepizzaslice, - /obj/item/food/cheesepizzaslice, - /obj/item/food/garlicpizzaslice, - /obj/item/food/donkpocketpizzaslice, - /obj/item/food/dankpizzaslice, - /obj/item/food/macpizzaslice, - /obj/item/food/firecrackerpizzaslice, - /obj/item/food/pestopizzaslice, - /obj/item/food/pepperonipizzaslice, + /obj/item/food/slice/margherita_pizza, + /obj/item/food/slice/meat_pizza, + /obj/item/food/slice/mushroom_pizza, + /obj/item/food/slice/vegetable_pizza, + /obj/item/food/slice/cheese_pizza, + /obj/item/food/garlic_pizza, + /obj/item/food/slice/donk_pocket_pizza, + /obj/item/food/slice/dank_pizza, + /obj/item/food/slice/mac_pizza, + /obj/item/food/slice/fire_cracker_pizza, + /obj/item/food/slice/pesto_pizza, + /obj/item/food/slice/pepperoni_pizza, /obj/item/food/meat, /obj/item/food/meat/slab, /obj/item/food/grown, diff --git a/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm b/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm index 6b5c74975559..cfe398346b09 100644 --- a/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm +++ b/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm @@ -18,7 +18,7 @@ valid_food += candidate if(!valid_food) - food_type = /obj/item/food/cheesewedge + food_type = /obj/item/food/slice/cheesewedge amount = 50 return diff --git a/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt b/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt index 87ee4c8e2af7..51c06aec4aa0 100644 --- a/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt +++ b/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt @@ -115,7 +115,7 @@ /obj/item/aiModule/protectStation/@SUBTYPES : /obj/item/ai_module/protect_station/@SUBTYPES{@OLD} /obj/item/food/sliceable/Ebi_maki/@SUBTYPES : /obj/item/food/sliceable/ebi_maki/@SUBTYPES{@OLD} /obj/item/food/sliceable/Tai_maki/@SUBTYPES : /obj/item/food/sliceable/tai_maki/@SUBTYPES{@OLD} -/obj/item/food/sushi_SmokedSalmon/@SUBTYPES : /obj/item/food/sushi_smoked_salmon/@SUBTYPES{@OLD} +/obj/item/food/sushi_SmokedSalmon/@SUBTYPES : /obj/item/food/slice/sushi_smoked_salmon/@SUBTYPES{@OLD} /area/ruin/unpowered/BMPship/Aft/@SUBTYPES : /area/ruin/unpowered/bmp_ship/aft/@SUBTYPES{@OLD} /datum/crafting_recipe/Sake_maki/@SUBTYPES : /datum/crafting_recipe/sake_maki/@SUBTYPES{@OLD} /datum/crafting_recipe/sushi_Ebi/@SUBTYPES : /datum/crafting_recipe/sushi_ebi/@SUBTYPES{@OLD} @@ -133,7 +133,7 @@ /datum/ErrorViewer/ErrorSource/@SUBTYPES : /datum/error_viewer/error_source/@SUBTYPES{@OLD} /datum/objective/revenantFluff/@SUBTYPES : /datum/objective/revenant_fluff/@SUBTYPES{@OLD} /datum/recipe/grill/sushi_Sake/@SUBTYPES : /datum/recipe/grill/sushi_sake/@SUBTYPES{@OLD} -/obj/item/food/sushi_TobikoEgg/@SUBTYPES : /obj/item/food/sushi_tobiko_egg/@SUBTYPES{@OLD} +/obj/item/food/sushi_TobikoEgg/@SUBTYPES : /obj/item/food/slice/sushi_tobiko_egg/@SUBTYPES{@OLD} /datum/ErrorViewer/ErrorCache/@SUBTYPES : /datum/error_viewer/error_cache/@SUBTYPES{@OLD} /datum/ErrorViewer/ErrorEntry/@SUBTYPES : /datum/error_viewer/error_entry/@SUBTYPES{@OLD} /datum/recipe/grill/sushi_Ebi/@SUBTYPES : /datum/recipe/grill/sushi_ebi/@SUBTYPES{@OLD} @@ -142,23 +142,23 @@ /area/ruin/unpowered/BMPship/@SUBTYPES : /area/ruin/unpowered/bmp_ship/@SUBTYPES{@OLD} /datum/dog_fashion/head/HoS/@SUBTYPES : /datum/dog_fashion/head/hos/@SUBTYPES{@OLD} /obj/item/clothing/head/HoS/@SUBTYPES : /obj/item/clothing/head/hos/@SUBTYPES{@OLD} -/obj/item/food/sushi_Masago/@SUBTYPES : /obj/item/food/sushi_masago/@SUBTYPES{@OLD} -/obj/item/food/sushi_Tamago/@SUBTYPES : /obj/item/food/sushi_tamago/@SUBTYPES{@OLD} -/obj/item/food/sushi_Tobiko/@SUBTYPES : /obj/item/food/sushi_tobiko/@SUBTYPES{@OLD} +/obj/item/food/slice/sushi_masago/@SUBTYPES : /obj/item/food/slice/sushi_masago/@SUBTYPES{@OLD} +/obj/item/food/slice/sushi_tamago/@SUBTYPES : /obj/item/food/slice/sushi_tamago/@SUBTYPES{@OLD} +/obj/item/food/slice/sushi_tobiko/@SUBTYPES : /obj/item/food/slice/sushi_tobiko/@SUBTYPES{@OLD} /obj/item/stack/packageWrap/@SUBTYPES : /obj/item/stack/package_wrap/@SUBTYPES{@OLD} /datum/crafting_recipe/IED/@SUBTYPES : /datum/crafting_recipe/ied/@SUBTYPES{@OLD} /datum/middleClickOverride/@SUBTYPES : /datum/middle_click_override/@SUBTYPES{@OLD} /obj/item/food/sushi_Ikura/@SUBTYPES : /obj/item/food/sushi_ikura/@SUBTYPES{@OLD} -/obj/item/food/sushi_Inari/@SUBTYPES : /obj/item/food/sushi_inari/@SUBTYPES{@OLD} +/obj/item/food/slice/sushi_inari/@SUBTYPES : /obj/item/food/slice/sushi_inari/@SUBTYPES{@OLD} /obj/item/food/sushi_Unagi/@SUBTYPES : /obj/item/food/sushi_unagi/@SUBTYPES{@OLD} /obj/item/storage/box/PDAs/@SUBTYPES : /obj/item/storage/box/pdas/@SUBTYPES{@OLD} /obj/structure/bigDelivery/@SUBTYPES : /obj/structure/big_delivery/@SUBTYPES{@OLD} /datum/mapGeneratorModule/@SUBTYPES : /datum/map_generator_module/@SUBTYPES{@OLD} -/obj/item/food/sushi_Sake/@SUBTYPES : /obj/item/food/sushi_sake/@SUBTYPES{@OLD} +/obj/item/food/slice/sushi_sake/@SUBTYPES : /obj/item/food/slice/sushi_sake/@SUBTYPES{@OLD} /obj/item/shippingPackage/@SUBTYPES : /obj/item/shipping_package/@SUBTYPES{@OLD} /obj/item/aiModule/toyAI/@SUBTYPES : /obj/item/aiModule/toy_ai/@SUBTYPES{@OLD} /obj/item/food/sushi_Ebi/@SUBTYPES : /obj/item/food/sushi_ebi/@SUBTYPES{@OLD} -/obj/item/food/sushi_Tai/@SUBTYPES : /obj/item/food/sushi_tai/@SUBTYPES{@OLD} +/obj/item/food/slice/sushi_tai/@SUBTYPES : /obj/item/food/slice/sushi_tai/@SUBTYPES{@OLD} /obj/item/smallDelivery/@SUBTYPES : /obj/item/small_delivery/@SUBTYPES{@OLD} /datum/design/BS_RPED/@SUBTYPES : /datum/design/bs_rped/@SUBTYPES{@OLD} /obj/item/paper/Court/@SUBTYPES : /obj/item/paper/court/@SUBTYPES{@OLD} diff --git a/tools/pr_sql/27268/snake_case_type_remap.json b/tools/pr_sql/27268/snake_case_type_remap.json index 1736a89de6f1..bda5874c3dc6 100644 --- a/tools/pr_sql/27268/snake_case_type_remap.json +++ b/tools/pr_sql/27268/snake_case_type_remap.json @@ -24,31 +24,106 @@ "replace": "/area/ruin/unpowered/bm_pship/midship", "override": "/area/ruin/unpowered/bmp_ship/midship" }, - { "original": "/area/station/security/prison/cell_block/A", "replace": "/area/station/security/prison/cell_block/a" }, - { "original": "/atom/movable/screen/act_intent/robot/AI", "replace": "/atom/movable/screen/act_intent/robot/ai" }, - { "original": "/atom/movable/screen/blob/BlobHelp", "replace": "/atom/movable/screen/blob/blob_help" }, - { "original": "/atom/movable/screen/blob/Blobbernaut", "replace": "/atom/movable/screen/blob/blobbernaut" }, - { "original": "/atom/movable/screen/blob/FactoryBlob", "replace": "/atom/movable/screen/blob/factory_blob" }, - { "original": "/atom/movable/screen/blob/JumpToCore", "replace": "/atom/movable/screen/blob/jump_to_core" }, - { "original": "/atom/movable/screen/blob/JumpToNode", "replace": "/atom/movable/screen/blob/jump_to_node" }, - { "original": "/atom/movable/screen/blob/NodeBlob", "replace": "/atom/movable/screen/blob/node_blob" }, - { "original": "/atom/movable/screen/blob/ReadaptChemical", "replace": "/atom/movable/screen/blob/readapt_chemical" }, - { "original": "/atom/movable/screen/blob/RelocateCore", "replace": "/atom/movable/screen/blob/relocate_core" }, - { "original": "/atom/movable/screen/blob/ResourceBlob", "replace": "/atom/movable/screen/blob/resource_blob" }, - { "original": "/atom/movable/screen/blob/Split", "replace": "/atom/movable/screen/blob/split" }, - { "original": "/atom/movable/screen/blob/StorageBlob", "replace": "/atom/movable/screen/blob/storage_blob" }, - { "original": "/atom/movable/screen/guardian/Communicate", "replace": "/atom/movable/screen/guardian/communicate" }, - { "original": "/atom/movable/screen/guardian/Manifest", "replace": "/atom/movable/screen/guardian/manifest" }, - { "original": "/atom/movable/screen/guardian/Recall", "replace": "/atom/movable/screen/guardian/recall" }, - { "original": "/atom/movable/screen/guardian/ToggleLight", "replace": "/atom/movable/screen/guardian/toggle_light" }, - { "original": "/atom/movable/screen/guardian/ToggleMode", "replace": "/atom/movable/screen/guardian/toggle_mode" }, - { "original": "/datum/AI_Module", "replace": "/datum/ai_module" }, - { "original": "/datum/ErrorViewer", "replace": "/datum/error_viewer" }, - { "original": "/datum/ErrorViewer/ErrorCache", "replace": "/datum/error_viewer/error_cache" }, - { "original": "/datum/ErrorViewer/ErrorEntry", "replace": "/datum/error_viewer/error_entry" }, - { "original": "/datum/ErrorViewer/ErrorSource", "replace": "/datum/error_viewer/error_source" }, - { "original": "/datum/SDQL_parser", "replace": "/datum/sdql_parser" }, - { "original": "/datum/action/changeling/absorbDNA", "replace": "/datum/action/changeling/absorb_dna" }, + { + "original": "/area/station/security/prison/cell_block/A", + "replace": "/area/station/security/prison/cell_block/a" + }, + { + "original": "/atom/movable/screen/act_intent/robot/AI", + "replace": "/atom/movable/screen/act_intent/robot/ai" + }, + { + "original": "/atom/movable/screen/blob/BlobHelp", + "replace": "/atom/movable/screen/blob/blob_help" + }, + { + "original": "/atom/movable/screen/blob/Blobbernaut", + "replace": "/atom/movable/screen/blob/blobbernaut" + }, + { + "original": "/atom/movable/screen/blob/FactoryBlob", + "replace": "/atom/movable/screen/blob/factory_blob" + }, + { + "original": "/atom/movable/screen/blob/JumpToCore", + "replace": "/atom/movable/screen/blob/jump_to_core" + }, + { + "original": "/atom/movable/screen/blob/JumpToNode", + "replace": "/atom/movable/screen/blob/jump_to_node" + }, + { + "original": "/atom/movable/screen/blob/NodeBlob", + "replace": "/atom/movable/screen/blob/node_blob" + }, + { + "original": "/atom/movable/screen/blob/ReadaptChemical", + "replace": "/atom/movable/screen/blob/readapt_chemical" + }, + { + "original": "/atom/movable/screen/blob/RelocateCore", + "replace": "/atom/movable/screen/blob/relocate_core" + }, + { + "original": "/atom/movable/screen/blob/ResourceBlob", + "replace": "/atom/movable/screen/blob/resource_blob" + }, + { + "original": "/atom/movable/screen/blob/Split", + "replace": "/atom/movable/screen/blob/split" + }, + { + "original": "/atom/movable/screen/blob/StorageBlob", + "replace": "/atom/movable/screen/blob/storage_blob" + }, + { + "original": "/atom/movable/screen/guardian/Communicate", + "replace": "/atom/movable/screen/guardian/communicate" + }, + { + "original": "/atom/movable/screen/guardian/Manifest", + "replace": "/atom/movable/screen/guardian/manifest" + }, + { + "original": "/atom/movable/screen/guardian/Recall", + "replace": "/atom/movable/screen/guardian/recall" + }, + { + "original": "/atom/movable/screen/guardian/ToggleLight", + "replace": "/atom/movable/screen/guardian/toggle_light" + }, + { + "original": "/atom/movable/screen/guardian/ToggleMode", + "replace": "/atom/movable/screen/guardian/toggle_mode" + }, + { + "original": "/datum/AI_Module", + "replace": "/datum/ai_module" + }, + { + "original": "/datum/ErrorViewer", + "replace": "/datum/error_viewer" + }, + { + "original": "/datum/ErrorViewer/ErrorCache", + "replace": "/datum/error_viewer/error_cache" + }, + { + "original": "/datum/ErrorViewer/ErrorEntry", + "replace": "/datum/error_viewer/error_entry" + }, + { + "original": "/datum/ErrorViewer/ErrorSource", + "replace": "/datum/error_viewer/error_source" + }, + { + "original": "/datum/SDQL_parser", + "replace": "/datum/sdql_parser" + }, + { + "original": "/datum/action/changeling/absorbDNA", + "replace": "/datum/action/changeling/absorb_dna" + }, { "original": "/datum/action/item_action/YEEEAAAAAHHHHHHHHHHHHH", "replace": "/datum/action/item_action/yeeeaaaaahhhhhhhhhhhhh" @@ -57,45 +132,148 @@ "original": "/datum/action/item_action/equip_unequip_TED_Gun", "replace": "/datum/action/item_action/equip_unequip_ted_gun" }, - { "original": "/datum/bottler_recipe/Applepocalypse", "replace": "/datum/bottler_recipe/applepocalypse" }, - { "original": "/datum/bottler_recipe/Berry_Banned", "replace": "/datum/bottler_recipe/berry_banned" }, - { "original": "/datum/bottler_recipe/Berry_Banned2", "replace": "/datum/bottler_recipe/berry_banned2" }, - { "original": "/datum/bottler_recipe/Blackeye_Brew", "replace": "/datum/bottler_recipe/blackeye_brew" }, - { "original": "/datum/bottler_recipe/Grape_Granade", "replace": "/datum/bottler_recipe/grape_granade" }, - { "original": "/datum/bottler_recipe/Meteor_Malt", "replace": "/datum/bottler_recipe/meteor_malt" }, - { "original": "/datum/bottler_recipe/Paradise_Punch", "replace": "/datum/bottler_recipe/paradise_punch" }, - { "original": "/datum/chemical_reaction/kahluaVodka", "replace": "/datum/chemical_reaction/kahlua_vodka" }, - { "original": "/datum/chemical_reaction/slimeRNG", "replace": "/datum/chemical_reaction/slime_rng" }, - { "original": "/datum/crafting_recipe/Ebi_maki", "replace": "/datum/crafting_recipe/ebi_maki" }, - { "original": "/datum/crafting_recipe/IED", "replace": "/datum/crafting_recipe/ied" }, - { "original": "/datum/crafting_recipe/Ikura_maki", "replace": "/datum/crafting_recipe/ikura_maki" }, - { "original": "/datum/crafting_recipe/Inari_maki", "replace": "/datum/crafting_recipe/inari_maki" }, - { "original": "/datum/crafting_recipe/Masago_maki", "replace": "/datum/crafting_recipe/masago_maki" }, - { "original": "/datum/crafting_recipe/Sake_maki", "replace": "/datum/crafting_recipe/sake_maki" }, - { "original": "/datum/crafting_recipe/SmokedSalmon_maki", "replace": "/datum/crafting_recipe/smoked_salmon_maki" }, - { "original": "/datum/crafting_recipe/Tai_maki", "replace": "/datum/crafting_recipe/tai_maki" }, - { "original": "/datum/crafting_recipe/TobikoEgg_maki", "replace": "/datum/crafting_recipe/tobiko_egg_maki" }, - { "original": "/datum/crafting_recipe/Tobiko_maki", "replace": "/datum/crafting_recipe/tobiko_maki" }, - { "original": "/datum/crafting_recipe/sushi_Ebi", "replace": "/datum/crafting_recipe/sushi_ebi" }, - { "original": "/datum/crafting_recipe/sushi_Ikura", "replace": "/datum/crafting_recipe/sushi_ikura" }, - { "original": "/datum/crafting_recipe/sushi_Inari", "replace": "/datum/crafting_recipe/sushi_inari" }, - { "original": "/datum/crafting_recipe/sushi_Masago", "replace": "/datum/crafting_recipe/sushi_masago" }, - { "original": "/datum/crafting_recipe/sushi_Sake", "replace": "/datum/crafting_recipe/sushi_sake" }, - { "original": "/datum/crafting_recipe/sushi_SmokedSalmon", "replace": "/datum/crafting_recipe/sushi_smoked_salmon" }, - { "original": "/datum/crafting_recipe/sushi_Tai", "replace": "/datum/crafting_recipe/sushi_tai" }, - { "original": "/datum/crafting_recipe/sushi_Tobiko", "replace": "/datum/crafting_recipe/sushi_tobiko" }, - { "original": "/datum/crafting_recipe/sushi_TobikoEgg", "replace": "/datum/crafting_recipe/sushi_tobiko_egg" }, - { "original": "/datum/design/BS_RPED", "replace": "/datum/design/bs_rped" }, - { "original": "/datum/design/RPED", "replace": "/datum/design/rped" }, + { + "original": "/datum/bottler_recipe/Applepocalypse", + "replace": "/datum/bottler_recipe/applepocalypse" + }, + { + "original": "/datum/bottler_recipe/Berry_Banned", + "replace": "/datum/bottler_recipe/berry_banned" + }, + { + "original": "/datum/bottler_recipe/Berry_Banned2", + "replace": "/datum/bottler_recipe/berry_banned2" + }, + { + "original": "/datum/bottler_recipe/Blackeye_Brew", + "replace": "/datum/bottler_recipe/blackeye_brew" + }, + { + "original": "/datum/bottler_recipe/Grape_Granade", + "replace": "/datum/bottler_recipe/grape_granade" + }, + { + "original": "/datum/bottler_recipe/Meteor_Malt", + "replace": "/datum/bottler_recipe/meteor_malt" + }, + { + "original": "/datum/bottler_recipe/Paradise_Punch", + "replace": "/datum/bottler_recipe/paradise_punch" + }, + { + "original": "/datum/chemical_reaction/kahluaVodka", + "replace": "/datum/chemical_reaction/kahlua_vodka" + }, + { + "original": "/datum/chemical_reaction/slimeRNG", + "replace": "/datum/chemical_reaction/slime_rng" + }, + { + "original": "/datum/crafting_recipe/Ebi_maki", + "replace": "/datum/crafting_recipe/ebi_maki" + }, + { + "original": "/datum/crafting_recipe/IED", + "replace": "/datum/crafting_recipe/ied" + }, + { + "original": "/datum/crafting_recipe/Ikura_maki", + "replace": "/datum/crafting_recipe/ikura_maki" + }, + { + "original": "/datum/crafting_recipe/Inari_maki", + "replace": "/datum/crafting_recipe/inari_maki" + }, + { + "original": "/datum/crafting_recipe/Masago_maki", + "replace": "/datum/crafting_recipe/masago_maki" + }, + { + "original": "/datum/crafting_recipe/Sake_maki", + "replace": "/datum/crafting_recipe/sake_maki" + }, + { + "original": "/datum/crafting_recipe/SmokedSalmon_maki", + "replace": "/datum/crafting_recipe/smoked_salmon_maki" + }, + { + "original": "/datum/crafting_recipe/Tai_maki", + "replace": "/datum/crafting_recipe/tai_maki" + }, + { + "original": "/datum/crafting_recipe/TobikoEgg_maki", + "replace": "/datum/crafting_recipe/tobiko_egg_maki" + }, + { + "original": "/datum/crafting_recipe/Tobiko_maki", + "replace": "/datum/crafting_recipe/tobiko_maki" + }, + { + "original": "/datum/crafting_recipe/sushi_Ebi", + "replace": "/datum/crafting_recipe/sushi_ebi" + }, + { + "original": "/datum/crafting_recipe/sushi_Ikura", + "replace": "/datum/crafting_recipe/sushi_ikura" + }, + { + "original": "/datum/crafting_recipe/sushi_Inari", + "replace": "/datum/crafting_recipe/sushi_inari" + }, + { + "original": "/datum/crafting_recipe/sushi_Masago", + "replace": "/datum/crafting_recipe/sushi_masago" + }, + { + "original": "/datum/crafting_recipe/sushi_Sake", + "replace": "/datum/crafting_recipe/sushi_sake" + }, + { + "original": "/datum/crafting_recipe/sushi_SmokedSalmon", + "replace": "/datum/crafting_recipe/sushi_smoked_salmon" + }, + { + "original": "/datum/crafting_recipe/sushi_Tai", + "replace": "/datum/crafting_recipe/sushi_tai" + }, + { + "original": "/datum/crafting_recipe/sushi_Tobiko", + "replace": "/datum/crafting_recipe/sushi_tobiko" + }, + { + "original": "/datum/crafting_recipe/sushi_TobikoEgg", + "replace": "/datum/crafting_recipe/sushi_tobiko_egg" + }, + { + "original": "/datum/design/BS_RPED", + "replace": "/datum/design/bs_rped" + }, + { + "original": "/datum/design/RPED", + "replace": "/datum/design/rped" + }, { "original": "/datum/dog_fashion/head/HoS", "replace": "/datum/dog_fashion/head/ho_s", "override": "/datum/dog_fashion/head/hos" }, - { "original": "/datum/gear/pAI", "replace": "/datum/gear/p_ai", "override": "/datum/gear/pai" }, - { "original": "/datum/holiday/UFO", "replace": "/datum/holiday/ufo" }, - { "original": "/datum/mapGenerator", "replace": "/datum/map_generator" }, - { "original": "/datum/mapGeneratorModule", "replace": "/datum/map_generator_module" }, + { + "original": "/datum/gear/pAI", + "replace": "/datum/gear/p_ai", + "override": "/datum/gear/pai" + }, + { + "original": "/datum/holiday/UFO", + "replace": "/datum/holiday/ufo" + }, + { + "original": "/datum/mapGenerator", + "replace": "/datum/map_generator" + }, + { + "original": "/datum/mapGeneratorModule", + "replace": "/datum/map_generator_module" + }, { "original": "/datum/mapGeneratorModule/border/asteroidWalls", "replace": "/datum/map_generator_module/border/asteroid_walls" @@ -104,7 +282,10 @@ "original": "/datum/mapGeneratorModule/border/syndieWalls", "replace": "/datum/map_generator_module/border/syndie_walls" }, - { "original": "/datum/mapGeneratorModule/bottomLayer", "replace": "/datum/map_generator_module/bottom_layer" }, + { + "original": "/datum/mapGeneratorModule/bottomLayer", + "replace": "/datum/map_generator_module/bottom_layer" + }, { "original": "/datum/mapGeneratorModule/bottomLayer/asteroidTurfs", "replace": "/datum/map_generator_module/bottom_layer/asteroid_turfs" @@ -121,16 +302,34 @@ "original": "/datum/mapGeneratorModule/bottomLayer/syndieFloor", "replace": "/datum/map_generator_module/bottom_layer/syndie_floor" }, - { "original": "/datum/mapGeneratorModule/deadTrees", "replace": "/datum/map_generator_module/dead_trees" }, - { "original": "/datum/mapGeneratorModule/denseLayer", "replace": "/datum/map_generator_module/dense_layer" }, + { + "original": "/datum/mapGeneratorModule/deadTrees", + "replace": "/datum/map_generator_module/dead_trees" + }, + { + "original": "/datum/mapGeneratorModule/denseLayer", + "replace": "/datum/map_generator_module/dense_layer" + }, { "original": "/datum/mapGeneratorModule/denseLayer/grassTufts", "replace": "/datum/map_generator_module/dense_layer/grass_tufts" }, - { "original": "/datum/mapGeneratorModule/pineTrees", "replace": "/datum/map_generator_module/pine_trees" }, - { "original": "/datum/mapGeneratorModule/randBushes", "replace": "/datum/map_generator_module/rand_bushes" }, - { "original": "/datum/mapGeneratorModule/randRocks", "replace": "/datum/map_generator_module/rand_rocks" }, - { "original": "/datum/mapGeneratorModule/splatterLayer", "replace": "/datum/map_generator_module/splatter_layer" }, + { + "original": "/datum/mapGeneratorModule/pineTrees", + "replace": "/datum/map_generator_module/pine_trees" + }, + { + "original": "/datum/mapGeneratorModule/randBushes", + "replace": "/datum/map_generator_module/rand_bushes" + }, + { + "original": "/datum/mapGeneratorModule/randRocks", + "replace": "/datum/map_generator_module/rand_rocks" + }, + { + "original": "/datum/mapGeneratorModule/splatterLayer", + "replace": "/datum/map_generator_module/splatter_layer" + }, { "original": "/datum/mapGeneratorModule/splatterLayer/asteroidMonsters", "replace": "/datum/map_generator_module/splatter_layer/asteroid_monsters" @@ -147,25 +346,82 @@ "original": "/datum/mapGeneratorModule/syndieFurniture", "replace": "/datum/map_generator_module/syndie_furniture" }, - { "original": "/datum/middleClickOverride", "replace": "/datum/middle_click_override" }, - { "original": "/datum/middleClickOverride/badminClicker", "replace": "/datum/middle_click_override/badmin_clicker" }, - { "original": "/datum/objective/abductee/POWERUNLIMITED", "replace": "/datum/objective/abductee/powerunlimited" }, - { "original": "/datum/objective/revenantFluff", "replace": "/datum/objective/revenant_fluff" }, - { "original": "/datum/paiController", "replace": "/datum/pai_controller" }, - { "original": "/datum/prize_item/AI", "replace": "/datum/prize_item/ai" }, - { "original": "/datum/recipe/grill/sushi_Ebi", "replace": "/datum/recipe/grill/sushi_ebi" }, - { "original": "/datum/recipe/grill/sushi_Ikura", "replace": "/datum/recipe/grill/sushi_ikura" }, - { "original": "/datum/recipe/grill/sushi_Inari", "replace": "/datum/recipe/grill/sushi_inari" }, - { "original": "/datum/recipe/grill/sushi_Masago", "replace": "/datum/recipe/grill/sushi_masago" }, - { "original": "/datum/recipe/grill/sushi_Sake", "replace": "/datum/recipe/grill/sushi_sake" }, - { "original": "/datum/recipe/grill/sushi_SmokedSalmon", "replace": "/datum/recipe/grill/sushi_smoked_salmon" }, - { "original": "/datum/recipe/grill/sushi_Tai", "replace": "/datum/recipe/grill/sushi_tai" }, - { "original": "/datum/recipe/grill/sushi_Tamago", "replace": "/datum/recipe/grill/sushi_tamago" }, - { "original": "/datum/recipe/grill/sushi_Tobiko", "replace": "/datum/recipe/grill/sushi_tobiko" }, - { "original": "/datum/recipe/grill/sushi_TobikoEgg", "replace": "/datum/recipe/grill/sushi_tobiko_egg" }, - { "original": "/datum/recipe/grill/sushi_Unagi", "replace": "/datum/recipe/grill/sushi_unagi" }, - { "original": "/datum/sortInstance", "replace": "/datum/sort_instance" }, - { "original": "/datum/spell/aoe/conjure/summonEdSwarm", "replace": "/datum/spell/aoe/conjure/summon_ed_swarm" }, + { + "original": "/datum/middleClickOverride", + "replace": "/datum/middle_click_override" + }, + { + "original": "/datum/middleClickOverride/badminClicker", + "replace": "/datum/middle_click_override/badmin_clicker" + }, + { + "original": "/datum/objective/abductee/POWERUNLIMITED", + "replace": "/datum/objective/abductee/powerunlimited" + }, + { + "original": "/datum/objective/revenantFluff", + "replace": "/datum/objective/revenant_fluff" + }, + { + "original": "/datum/paiController", + "replace": "/datum/pai_controller" + }, + { + "original": "/datum/prize_item/AI", + "replace": "/datum/prize_item/ai" + }, + { + "original": "/datum/recipe/grill/sushi_Ebi", + "replace": "/datum/recipe/grill/sushi_ebi" + }, + { + "original": "/datum/recipe/grill/sushi_Ikura", + "replace": "/datum/recipe/grill/sushi_ikura" + }, + { + "original": "/datum/recipe/grill/sushi_Inari", + "replace": "/datum/recipe/grill/sushi_inari" + }, + { + "original": "/datum/recipe/grill/sushi_Masago", + "replace": "/datum/recipe/grill/sushi_masago" + }, + { + "original": "/datum/recipe/grill/sushi_Sake", + "replace": "/datum/recipe/grill/sushi_sake" + }, + { + "original": "/datum/recipe/grill/sushi_SmokedSalmon", + "replace": "/datum/recipe/grill/sushi_smoked_salmon" + }, + { + "original": "/datum/recipe/grill/sushi_Tai", + "replace": "/datum/recipe/grill/sushi_tai" + }, + { + "original": "/datum/recipe/grill/sushi_Tamago", + "replace": "/datum/recipe/grill/sushi_tamago" + }, + { + "original": "/datum/recipe/grill/sushi_Tobiko", + "replace": "/datum/recipe/grill/sushi_tobiko" + }, + { + "original": "/datum/recipe/grill/sushi_TobikoEgg", + "replace": "/datum/recipe/grill/sushi_tobiko_egg" + }, + { + "original": "/datum/recipe/grill/sushi_Unagi", + "replace": "/datum/recipe/grill/sushi_unagi" + }, + { + "original": "/datum/sortInstance", + "replace": "/datum/sort_instance" + }, + { + "original": "/datum/spell/aoe/conjure/summonEdSwarm", + "replace": "/datum/spell/aoe/conjure/summon_ed_swarm" + }, { "original": "/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Curled", "replace": "/datum/sprite_accessory/head_accessory/kidan/kidan_mantie_curled" @@ -174,7 +430,10 @@ "original": "/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Long", "replace": "/datum/sprite_accessory/head_accessory/kidan/kidan_mantie_long" }, - { "original": "/datum/status_effect/hippocraticOath", "replace": "/datum/status_effect/hippocratic_oath" }, + { + "original": "/datum/status_effect/hippocraticOath", + "replace": "/datum/status_effect/hippocratic_oath" + }, { "original": "/datum/supply_packs/engineering/engine/PA", "replace": "/datum/supply_packs/engineering/engine/pa", @@ -185,28 +444,55 @@ "replace": "/datum/uplink_item/ammo/bulldog_x_lmagsbag", "override": "/datum/uplink_item/ammo/bulldog_xl_magsbag" }, - { "original": "/datum/uplink_item/bundles_TC", "replace": "/datum/uplink_item/bundles_tc" }, - { "original": "/datum/uplink_item/stealthy_weapons/RSG", "replace": "/datum/uplink_item/stealthy_weapons/rsg" }, - { "original": "/mob/camera/aiEye", "replace": "/mob/camera/ai_eye" }, - { "original": "/mob/living/simple_animal/cockroach/Brad", "replace": "/mob/living/simple_animal/cockroach/brad" }, - { "original": "/mob/living/simple_animal/crab/Coffee", "replace": "/mob/living/simple_animal/crab/coffee" }, + { + "original": "/datum/uplink_item/bundles_TC", + "replace": "/datum/uplink_item/bundles_tc" + }, + { + "original": "/datum/uplink_item/stealthy_weapons/RSG", + "replace": "/datum/uplink_item/stealthy_weapons/rsg" + }, + { + "original": "/mob/camera/aiEye", + "replace": "/mob/camera/ai_eye" + }, + { + "original": "/mob/living/simple_animal/cockroach/Brad", + "replace": "/mob/living/simple_animal/cockroach/brad" + }, + { + "original": "/mob/living/simple_animal/crab/Coffee", + "replace": "/mob/living/simple_animal/crab/coffee" + }, { "original": "/mob/living/simple_animal/hostile/bear/Hudson", "replace": "/mob/living/simple_animal/hostile/bear/hudson" }, - { "original": "/mob/living/simple_animal/mouse/brown/Tom", "replace": "/mob/living/simple_animal/mouse/brown/tom" }, + { + "original": "/mob/living/simple_animal/mouse/brown/Tom", + "replace": "/mob/living/simple_animal/mouse/brown/tom" + }, { "original": "/mob/living/simple_animal/mouse/white/Brain", "replace": "/mob/living/simple_animal/mouse/white/brain" }, - { "original": "/mob/living/simple_animal/parrot/Poly", "replace": "/mob/living/simple_animal/parrot/poly" }, + { + "original": "/mob/living/simple_animal/parrot/Poly", + "replace": "/mob/living/simple_animal/parrot/poly" + }, { "original": "/mob/living/simple_animal/pet/cat/Proc", "replace": "/mob/living/simple_animal/pet/cat/proc", "override": "/mob/living/simple_animal/pet/cat/proc_cat" }, - { "original": "/mob/living/simple_animal/pet/cat/Runtime", "replace": "/mob/living/simple_animal/pet/cat/runtime" }, - { "original": "/mob/living/simple_animal/pet/cat/Syndi", "replace": "/mob/living/simple_animal/pet/cat/syndi" }, + { + "original": "/mob/living/simple_animal/pet/cat/Runtime", + "replace": "/mob/living/simple_animal/pet/cat/runtime" + }, + { + "original": "/mob/living/simple_animal/pet/cat/Syndi", + "replace": "/mob/living/simple_animal/pet/cat/syndi" + }, { "original": "/mob/living/simple_animal/pet/cat/Var", "replace": "/mob/living/simple_animal/pet/cat/var", @@ -228,15 +514,42 @@ "original": "/mob/living/simple_animal/pet/dog/fox/Syndifox", "replace": "/mob/living/simple_animal/pet/dog/fox/syndifox" }, - { "original": "/obj/item/CQC_manual", "replace": "/obj/item/cqc_manual" }, - { "original": "/obj/item/FixOVein", "replace": "/obj/item/fix_o_vein" }, - { "original": "/obj/item/aiModule", "replace": "/obj/item/ai_module" }, - { "original": "/obj/item/aiModule/oneCrewMember", "replace": "/obj/item/ai_module/one_crew_member" }, - { "original": "/obj/item/aiModule/protectStation", "replace": "/obj/item/ai_module/protect_station" }, - { "original": "/obj/item/aiModule/toyAI", "replace": "/obj/item/aiModule/toy_ai" }, - { "original": "/obj/item/ammo_box/magazine/m12g/XtrLrg", "replace": "/obj/item/ammo_box/magazine/m12g/xtr_lrg" }, - { "original": "/obj/item/badminBook", "replace": "/obj/item/badmin_book" }, - { "original": "/obj/item/circuitboard/HolodeckControl", "replace": "/obj/item/circuitboard/holodeck_control" }, + { + "original": "/obj/item/CQC_manual", + "replace": "/obj/item/cqc_manual" + }, + { + "original": "/obj/item/FixOVein", + "replace": "/obj/item/fix_o_vein" + }, + { + "original": "/obj/item/aiModule", + "replace": "/obj/item/ai_module" + }, + { + "original": "/obj/item/aiModule/oneCrewMember", + "replace": "/obj/item/ai_module/one_crew_member" + }, + { + "original": "/obj/item/aiModule/protectStation", + "replace": "/obj/item/ai_module/protect_station" + }, + { + "original": "/obj/item/aiModule/toyAI", + "replace": "/obj/item/aiModule/toy_ai" + }, + { + "original": "/obj/item/ammo_box/magazine/m12g/XtrLrg", + "replace": "/obj/item/ammo_box/magazine/m12g/xtr_lrg" + }, + { + "original": "/obj/item/badminBook", + "replace": "/obj/item/badmin_book" + }, + { + "original": "/obj/item/circuitboard/HolodeckControl", + "replace": "/obj/item/circuitboard/holodeck_control" + }, { "original": "/obj/item/clothing/accessory/medal/fluff/XannZxiax", "replace": "/obj/item/clothing/accessory/medal/fluff/xann_zxiax" @@ -256,38 +569,110 @@ "replace": "/obj/item/clothing/head/collectable/ho_s", "override": "/obj/item/clothing/head/collectable/hos" }, - { "original": "/obj/item/destTagger", "replace": "/obj/item/dest_tagger" }, - { "original": "/obj/item/food/sliceable/Ebi_maki", "replace": "/obj/item/food/sliceable/ebi_maki" }, - { "original": "/obj/item/food/sliceable/Ikura_maki", "replace": "/obj/item/food/sliceable/ikura_maki" }, - { "original": "/obj/item/food/sliceable/Inari_maki", "replace": "/obj/item/food/sliceable/inari_maki" }, - { "original": "/obj/item/food/sliceable/Masago_maki", "replace": "/obj/item/food/sliceable/masago_maki" }, - { "original": "/obj/item/food/sliceable/Sake_maki", "replace": "/obj/item/food/sliceable/sake_maki" }, + { + "original": "/obj/item/destTagger", + "replace": "/obj/item/dest_tagger" + }, + { + "original": "/obj/item/food/sliceable/Ebi_maki", + "replace": "/obj/item/food/sliceable/ebi_maki" + }, + { + "original": "/obj/item/food/sliceable/Ikura_maki", + "replace": "/obj/item/food/sliceable/ikura_maki" + }, + { + "original": "/obj/item/food/sliceable/Inari_maki", + "replace": "/obj/item/food/sliceable/inari_maki" + }, + { + "original": "/obj/item/food/sliceable/Masago_maki", + "replace": "/obj/item/food/sliceable/masago_maki" + }, + { + "original": "/obj/item/food/sliceable/Sake_maki", + "replace": "/obj/item/food/sliceable/sake_maki" + }, { "original": "/obj/item/food/sliceable/SmokedSalmon_maki", "replace": "/obj/item/food/sliceable/smoked_salmon_maki" }, - { "original": "/obj/item/food/sliceable/Tai_maki", "replace": "/obj/item/food/sliceable/tai_maki" }, - { "original": "/obj/item/food/sliceable/Tamago_maki", "replace": "/obj/item/food/sliceable/tamago_maki" }, - { "original": "/obj/item/food/sliceable/TobikoEgg_maki", "replace": "/obj/item/food/sliceable/tobiko_egg_maki" }, - { "original": "/obj/item/food/sliceable/Tobiko_maki", "replace": "/obj/item/food/sliceable/tobiko_maki" }, - { "original": "/obj/item/food/sushi_Ebi", "replace": "/obj/item/food/sushi_ebi" }, - { "original": "/obj/item/food/sushi_Ikura", "replace": "/obj/item/food/sushi_ikura" }, - { "original": "/obj/item/food/sushi_Inari", "replace": "/obj/item/food/sushi_inari" }, - { "original": "/obj/item/food/sushi_Masago", "replace": "/obj/item/food/sushi_masago" }, - { "original": "/obj/item/food/sushi_Sake", "replace": "/obj/item/food/sushi_sake" }, - { "original": "/obj/item/food/sushi_SmokedSalmon", "replace": "/obj/item/food/sushi_smoked_salmon" }, - { "original": "/obj/item/food/sushi_Tai", "replace": "/obj/item/food/sushi_tai" }, - { "original": "/obj/item/food/sushi_Tamago", "replace": "/obj/item/food/sushi_tamago" }, - { "original": "/obj/item/food/sushi_Tobiko", "replace": "/obj/item/food/sushi_tobiko" }, - { "original": "/obj/item/food/sushi_TobikoEgg", "replace": "/obj/item/food/sushi_tobiko_egg" }, - { "original": "/obj/item/food/sushi_Unagi", "replace": "/obj/item/food/sushi_unagi" }, + { + "original": "/obj/item/food/sliceable/Tai_maki", + "replace": "/obj/item/food/sliceable/tai_maki" + }, + { + "original": "/obj/item/food/sliceable/Tamago_maki", + "replace": "/obj/item/food/sliceable/tamago_maki" + }, + { + "original": "/obj/item/food/sliceable/TobikoEgg_maki", + "replace": "/obj/item/food/sliceable/tobiko_egg_maki" + }, + { + "original": "/obj/item/food/sliceable/Tobiko_maki", + "replace": "/obj/item/food/sliceable/tobiko_maki" + }, + { + "original": "/obj/item/food/sushi_Ebi", + "replace": "/obj/item/food/sushi_ebi" + }, + { + "original": "/obj/item/food/sushi_Ikura", + "replace": "/obj/item/food/sushi_ikura" + }, + { + "original": "/obj/item/food/slice/sushi_inari", + "replace": "/obj/item/food/slice/sushi_inari" + }, + { + "original": "/obj/item/food/slice/sushi_masago", + "replace": "/obj/item/food/slice/sushi_masago" + }, + { + "original": "/obj/item/food/slice/sushi_sake", + "replace": "/obj/item/food/slice/sushi_sake" + }, + { + "original": "/obj/item/food/sushi_SmokedSalmon", + "replace": "/obj/item/food/slice/sushi_smoked_salmon" + }, + { + "original": "/obj/item/food/slice/sushi_tai", + "replace": "/obj/item/food/slice/sushi_tai" + }, + { + "original": "/obj/item/food/slice/sushi_tamago", + "replace": "/obj/item/food/slice/sushi_tamago" + }, + { + "original": "/obj/item/food/slice/sushi_tobiko", + "replace": "/obj/item/food/slice/sushi_tobiko" + }, + { + "original": "/obj/item/food/sushi_TobikoEgg", + "replace": "/obj/item/food/slice/sushi_tobiko_egg" + }, + { + "original": "/obj/item/food/sushi_Unagi", + "replace": "/obj/item/food/sushi_unagi" + }, { "original": "/obj/item/gun/projectile/automatic/pistol/APS", "replace": "/obj/item/gun/projectile/automatic/pistol/aps" }, - { "original": "/obj/item/paper/Court", "replace": "/obj/item/paper/court" }, - { "original": "/obj/item/paper/Toxin", "replace": "/obj/item/paper/toxin" }, - { "original": "/obj/item/reagent_containers/hypospray/CMO", "replace": "/obj/item/reagent_containers/hypospray/cmo" }, + { + "original": "/obj/item/paper/Court", + "replace": "/obj/item/paper/court" + }, + { + "original": "/obj/item/paper/Toxin", + "replace": "/obj/item/paper/toxin" + }, + { + "original": "/obj/item/reagent_containers/hypospray/CMO", + "replace": "/obj/item/reagent_containers/hypospray/cmo" + }, { "original": "/obj/item/reagent_containers/iv_bag/blood/AMinus", "replace": "/obj/item/reagent_containers/iv_bag/blood/a_minus" @@ -312,9 +697,18 @@ "original": "/obj/item/reagent_containers/iv_bag/blood/OPlus", "replace": "/obj/item/reagent_containers/iv_bag/blood/o_plus" }, - { "original": "/obj/item/shippingPackage", "replace": "/obj/item/shipping_package" }, - { "original": "/obj/item/smallDelivery", "replace": "/obj/item/small_delivery" }, - { "original": "/obj/item/stack/packageWrap", "replace": "/obj/item/stack/package_wrap" }, + { + "original": "/obj/item/shippingPackage", + "replace": "/obj/item/shipping_package" + }, + { + "original": "/obj/item/smallDelivery", + "replace": "/obj/item/small_delivery" + }, + { + "original": "/obj/item/stack/packageWrap", + "replace": "/obj/item/stack/package_wrap" + }, { "original": "/obj/item/storage/backpack/duffel/syndie/shotgunXLmags", "replace": "/obj/item/storage/backpack/duffel/syndie/shotgun_x_lmags", @@ -325,11 +719,33 @@ "replace": "/obj/item/storage/box/pd_as", "override": "/obj/item/storage/box/pdas" }, - { "original": "/obj/item/toy/AI", "replace": "/obj/item/toy/ai" }, - { "original": "/obj/machinery/computer/HolodeckControl", "replace": "/obj/machinery/computer/holodeck_control" }, - { "original": "/obj/machinery/disposal/deliveryChute", "replace": "/obj/machinery/disposal/delivery_chute" }, - { "original": "/obj/structure/AIcore", "replace": "/obj/structure/a_icore", "override": "/obj/structure/ai_core" }, - { "original": "/obj/structure/bigDelivery", "replace": "/obj/structure/big_delivery" }, - { "original": "/obj/structure/closet/secure_closet/CMO", "replace": "/obj/structure/closet/secure_closet/cmo" }, - { "original": "/obj/structure/closet/secure_closet/RD", "replace": "/obj/structure/closet/secure_closet/rd" } -] + { + "original": "/obj/item/toy/AI", + "replace": "/obj/item/toy/ai" + }, + { + "original": "/obj/machinery/computer/HolodeckControl", + "replace": "/obj/machinery/computer/holodeck_control" + }, + { + "original": "/obj/machinery/disposal/deliveryChute", + "replace": "/obj/machinery/disposal/delivery_chute" + }, + { + "original": "/obj/structure/AIcore", + "replace": "/obj/structure/a_icore", + "override": "/obj/structure/ai_core" + }, + { + "original": "/obj/structure/bigDelivery", + "replace": "/obj/structure/big_delivery" + }, + { + "original": "/obj/structure/closet/secure_closet/CMO", + "replace": "/obj/structure/closet/secure_closet/cmo" + }, + { + "original": "/obj/structure/closet/secure_closet/RD", + "replace": "/obj/structure/closet/secure_closet/rd" + } +] \ No newline at end of file From 607e91d41205f7da5c4a546a778d5e6f0ec8bfc0 Mon Sep 17 00:00:00 2001 From: Drsmail Date: Fri, 3 Jan 2025 03:04:40 +0300 Subject: [PATCH 2/8] Refactor --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 6 +- .../RandomRuins/SpaceRuins/blowntcommsat.dmm | 2 +- .../RandomRuins/SpaceRuins/moonoutpost19.dmm | 8 +- .../SpaceRuins/syndiecakesfactory.dmm | 8 +- .../SpaceRuins/wreckedcargoship.dmm | 4 +- _maps/map_files/generic/centcomm.dmm | 2 +- _maps/map_files/stations/boxstation.dmm | 6 +- _maps/map_files/stations/cerestation.dmm | 6 +- _maps/map_files/stations/deltastation.dmm | 6 +- _maps/map_files/stations/emeraldstation.dmm | 2 +- _maps/map_files/stations/metastation.dmm | 8 +- .../granters/action_granters/summon_cheese.dm | 4 +- code/game/objects/items/toys.dm | 2 +- .../contractor/datums/syndicate_contract.dm | 2 +- .../food_and_drinks/food/customizables.dm | 2 +- .../food_and_drinks/food/foods/baked_goods.dm | 108 ++++++++--------- .../food_and_drinks/food/foods/bread.dm | 32 ++--- .../food_and_drinks/food/foods/ingredients.dm | 34 +++--- .../food_and_drinks/food/foods/meat.dm | 4 +- .../food_and_drinks/food/foods/pizza.dm | 48 ++++---- .../food_and_drinks/food/foods/seafood.dm | 32 ++--- code/modules/food_and_drinks/food_base.dm | 16 +-- .../kitchen_machinery/deep_fryer.dm | 2 +- .../kitchen_machinery/processor.dm | 2 +- .../food_and_drinks/recipes/recipes_candy.dm | 2 +- .../food_and_drinks/recipes/recipes_grill.dm | 28 ++--- .../recipes/recipes_microwave.dm | 114 +++++++++--------- .../food_and_drinks/recipes/recipes_oven.dm | 84 ++++++------- .../recipes/tablecraft/recipes_table.dm | 28 ++--- code/modules/hydroponics/grown/melon.dm | 2 +- code/modules/hydroponics/grown/onion.dm | 8 +- code/modules/hydroponics/grown/pineapple.dm | 2 +- code/modules/hydroponics/grown/tomato.dm | 2 +- .../mob/living/simple_animal/friendly/cat.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 2 +- code/modules/projectiles/guns/chaos_bolt.dm | 4 +- .../chemistry/machinery/reagentgrinder.dm | 2 +- .../chemistry/reagents/food_reagents.dm | 4 +- .../chemistry/recipes/slime_extracts.dm | 24 ++-- .../secondary/kitchen/random_bulk_food.dm | 2 +- .../Scripts/27268_snake_case_remap.txt | 16 +-- tools/pr_sql/27268/snake_case_type_remap.json | 28 ++--- 42 files changed, 350 insertions(+), 350 deletions(-) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 80a6288e247c..878309c164fb 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -33,7 +33,7 @@ /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "j" = ( -obj/item/food/slice/mushroom_pizza, +/obj/item/food/sliced/mushroom_pizza, /obj/effect/decal/cleanable/dirt, /turf/simulated/floor/plating/lavaland_air, /area/ruin/powered/pizza_party) @@ -144,13 +144,13 @@ obj/item/food/slice/mushroom_pizza, /area/ruin/powered/pizza_party) "D" = ( /obj/structure/table/wood, -obj/item/food/slice/margherita_pizza, +obj/item/food/sliced/margherita_pizza, /obj/item/trash/plate, /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "E" = ( /obj/structure/table/wood, -obj/item/food/slice/meat_pizza, +obj/item/food/sliced/meat_pizza, /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "F" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index bd783073ba25..b0409cedcee7 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -585,7 +585,7 @@ /turf/simulated/wall/r_wall, /area/space/nearstation) "Nw" = ( -/obj/item/food/slice/xeno_meat_bread{ +/obj/item/food/sliced/xeno_meat_bread{ name = "green mold bread slice" }, /turf/simulated/floor/plating/airless, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm index fc8da4568505..dd46e6eaf51d 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/moonoutpost19.dmm @@ -2001,7 +2001,7 @@ }, /area/ruin/space/moonbase19) "gy" = ( -/obj/item/food/slice/xeno_meat_bread{ +/obj/item/food/sliced/xeno_meat_bread{ pixel_y = 5 }, /obj/item/reagent_containers/drinks/coffee{ @@ -6703,12 +6703,12 @@ }, /area/ruin/space/moonbase19) "yR" = ( -/obj/item/food/slice/xeno_meat_bread, -/obj/item/food/slice/xeno_meat_bread{ +/obj/item/food/sliced/xeno_meat_bread, +/obj/item/food/sliced/xeno_meat_bread{ pixel_y = 7; pixel_x = 6 }, -/obj/item/food/slice/xeno_meat_bread{ +/obj/item/food/sliced/xeno_meat_bread{ pixel_y = 9; pixel_x = -5 }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm index d61fec6a164d..e7ef12109168 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/syndiecakesfactory.dmm @@ -371,11 +371,11 @@ /area/ruin/space/syndicakefactory) "qd" = ( /obj/structure/table/glass/reinforced/plastitanium, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread{ +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread{ pixel_y = 4 }, -/obj/item/food/slice/bread{ +/obj/item/food/sliced/bread{ pixel_y = 8 }, /obj/machinery/light/small{ @@ -1069,7 +1069,7 @@ pixel_x = 8; pixel_y = 8 }, -/obj/item/food/slice/birthday_cake, +/obj/item/food/sliced/birthday_cake, /turf/simulated/floor/plasteel{ icon_state = "floorgrime" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm index 99bb732ee57f..87427f5b09af 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/wreckedcargoship.dmm @@ -224,8 +224,8 @@ /area/ruin/space/wreck_cargoship) "jm" = ( /obj/item/toy/plushie/ipcplushie, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, /obj/item/paper/crumpled{ name = "unintelligible scribbles"; info = "toast... i must... the plushie..." diff --git a/_maps/map_files/generic/centcomm.dmm b/_maps/map_files/generic/centcomm.dmm index 5c82a2d0210e..7d79153ea1b6 100644 --- a/_maps/map_files/generic/centcomm.dmm +++ b/_maps/map_files/generic/centcomm.dmm @@ -4226,7 +4226,7 @@ /area/centcom/suppy) "nY" = ( /obj/structure/table/wood, -obj/item/food/slice/mushroom_pizza{ +/obj/item/food/sliced/mushroom_pizza{ pixel_x = -5; pixel_y = 5 }, diff --git a/_maps/map_files/stations/boxstation.dmm b/_maps/map_files/stations/boxstation.dmm index 7413bf9d2c1d..f82f65687444 100644 --- a/_maps/map_files/stations/boxstation.dmm +++ b/_maps/map_files/stations/boxstation.dmm @@ -80065,9 +80065,9 @@ /area/station/science/test_chamber) "tWD" = ( /obj/structure/closet/crate, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/_maps/map_files/stations/cerestation.dmm b/_maps/map_files/stations/cerestation.dmm index fb5bc7cad490..777b43c958e0 100644 --- a/_maps/map_files/stations/cerestation.dmm +++ b/_maps/map_files/stations/cerestation.dmm @@ -32551,9 +32551,9 @@ /area/station/security/permabrig) "flp" = ( /obj/structure/closet/crate, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/_maps/map_files/stations/deltastation.dmm b/_maps/map_files/stations/deltastation.dmm index 3bbe79ebb6f4..e36adf771b76 100644 --- a/_maps/map_files/stations/deltastation.dmm +++ b/_maps/map_files/stations/deltastation.dmm @@ -86456,9 +86456,9 @@ /area/station/hallway/secondary/entry/south) "urY" = ( /obj/structure/closet/crate, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/_maps/map_files/stations/emeraldstation.dmm b/_maps/map_files/stations/emeraldstation.dmm index ced9023b9275..c502fb236525 100644 --- a/_maps/map_files/stations/emeraldstation.dmm +++ b/_maps/map_files/stations/emeraldstation.dmm @@ -38943,7 +38943,7 @@ /obj/item/food/grown/pumpkin{ pixel_y = 14 }, -/obj/item/food/slice/pumpkinpie, +/obj/item/food/sliced/pumpkinpie, /turf/simulated/floor/plating, /area/station/maintenance/apmaint) "hGX" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index eb45a7905e2e..f7b981098e77 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -58857,7 +58857,7 @@ pixel_x = -4; pixel_y = 8 }, -/obj/item/food/slice/carrot_cake{ +/obj/item/food/sliced/carrot_cake{ pixel_x = 8; pixel_y = -2 }, @@ -70328,9 +70328,9 @@ "qvp" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, -/obj/item/food/slice/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, +/obj/item/food/sliced/bread, /obj/item/food/grown/potato, /obj/item/food/grown/potato, /obj/item/food/grown/onion, diff --git a/code/game/objects/items/granters/action_granters/summon_cheese.dm b/code/game/objects/items/granters/action_granters/summon_cheese.dm index 7f04ba9dd2fd..a80e7f0bf141 100644 --- a/code/game/objects/items/granters/action_granters/summon_cheese.dm +++ b/code/game/objects/items/granters/action_granters/summon_cheese.dm @@ -22,7 +22,7 @@ /obj/item/book/granter/spell/summon_cheese/recoil(mob/living/user) to_chat(user, "[src] turns into a wedge of cheese!") - var/obj/item/food/slice/cheesewedge/presliced/book_cheese = new + var/obj/item/food/sliced/cheesewedge/presliced/book_cheese = new user.drop_item() user.put_in_hands(book_cheese) qdel(src) @@ -35,7 +35,7 @@ overlay = null action_icon_state = "cheese_wedge" action_background_icon_state = "bg_spell" - summon_type = list(/obj/item/food/slice/cheesewedge/presliced) + summon_type = list(/obj/item/food/sliced/cheesewedge/presliced) summon_amt = 9 aoe_range = 1 summon_ignore_prev_spawn_points = TRUE diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index a753a1c091b0..b763e7fc7660 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -832,7 +832,7 @@ /obj/item/toy/plushie/ipcplushie/attack_by(obj/item/attacking, mob/user, params) if(..()) return FINISH_ATTACK - if(istype(attacking, /obj/item/food/slice/bread)) + if(istype(attacking, /obj/item/food/sliced/bread)) new /obj/item/food/toast(get_turf(loc)) to_chat(user, "You insert bread into the toaster.") playsound(loc, 'sound/machines/ding.ogg', 50, 1) diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm index f751f806ef40..03b689205bb1 100644 --- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm @@ -423,7 +423,7 @@ M.update_icons() // Supply them with some chow. How generous is the Syndicate? - var/obj/item/food/slice/bread/food = new(get_turf(M)) + var/obj/item/food/sliced/bread/food = new(get_turf(M)) food.name = "stale bread" food.desc = "Looks like your captors care for their prisoners as much as their bread." food.trash = null diff --git a/code/modules/food_and_drinks/food/customizables.dm b/code/modules/food_and_drinks/food/customizables.dm index 85d0bd2fd367..d6e8500e9ca9 100644 --- a/code/modules/food_and_drinks/food/customizables.dm +++ b/code/modules/food_and_drinks/food/customizables.dm @@ -6,7 +6,7 @@ do {\ qdel(src);\ } while(FALSE) -/obj/item/food/slice/bread/attackby__legacy__attackchain(obj/item/W, mob/user, params) +/obj/item/food/sliced/bread/attackby__legacy__attackchain(obj/item/W, mob/user, params) if(istype(W, /obj/item/food) && !(W.flags & NODROP)) MAKE_CUSTOM_FOOD(W, user, /obj/item/food/customizable/sandwich) return diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 91afbaf60b0e..3bdcaf02d663 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -10,7 +10,7 @@ desc = "A favorite desert of a certain wascally wabbit. Not a lie." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "carrotcake" - slice_path = /obj/item/food/slice/carrot_cake + slice_path = /obj/item/food/sliced/carrot_cake slices_num = 5 bitesize = 3 filling_color = "#FFD675" @@ -18,7 +18,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/carrot_cake +/obj/item/food/sliced/carrot_cake name = "carrot cake slice" desc = "Carrotty slice of Carrot Cake, carrots are good for your eyes! Also not a lie." icon = 'icons/obj/food/bakedgoods.dmi' @@ -34,7 +34,7 @@ desc = "A squishy cake-thing." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "braincake" - slice_path = /obj/item/food/slice/brain_cake + slice_path = /obj/item/food/sliced/brain_cake slices_num = 5 filling_color = "#E6AEDB" bitesize = 3 @@ -42,7 +42,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/brain_cake +/obj/item/food/sliced/brain_cake name = "brain cake slice" desc = "Lemme tell you something about brains. THEY'RE DELICIOUS." icon = 'icons/obj/food/bakedgoods.dmi' @@ -57,7 +57,7 @@ desc = "DANGEROUSLY cheesy." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "cheesecake" - slice_path = /obj/item/food/slice/cheese_cake + slice_path = /obj/item/food/sliced/cheese_cake slices_num = 5 filling_color = "#FAF7AF" bitesize = 3 @@ -65,7 +65,7 @@ tastes = list("cake" = 4, "cream cheese" = 3) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/cheese_cake +/obj/item/food/sliced/cheese_cake name = "cheese cake slice" desc = "Slice of pure cheestisfaction." icon = 'icons/obj/food/bakedgoods.dmi' @@ -80,7 +80,7 @@ desc = "A plain cake, not a lie." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plaincake" - slice_path = /obj/item/food/slice/plain_cake + slice_path = /obj/item/food/sliced/plain_cake slices_num = 5 bitesize = 3 filling_color = "#F7EDD5" @@ -88,7 +88,7 @@ tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/plain_cake +/obj/item/food/sliced/plain_cake name = "plain cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -103,7 +103,7 @@ desc = "A cake with added orange." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "orangecake" - slice_path = /obj/item/food/slice/orange_cake + slice_path = /obj/item/food/sliced/orange_cake slices_num = 5 bitesize = 3 filling_color = "#FADA8E" @@ -111,7 +111,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/orange_cake +/obj/item/food/sliced/orange_cake name = "orange cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -126,7 +126,7 @@ desc = "A cake with added bananas." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "bananacake" - slice_path = /obj/item/food/slice/banana_cake + slice_path = /obj/item/food/sliced/banana_cake slices_num = 5 bitesize = 3 filling_color = "#FADA8E" @@ -134,7 +134,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/banana_cake +/obj/item/food/sliced/banana_cake name = "banana cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -150,14 +150,14 @@ icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "limecake" bitesize = 3 - slice_path = /obj/item/food/slice/lime_cake + slice_path = /obj/item/food/sliced/lime_cake slices_num = 5 filling_color = "#CBFA8E" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/lime_cake +/obj/item/food/sliced/lime_cake name = "lime cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -172,7 +172,7 @@ desc = "A cake with added lemon." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "lemoncake" - slice_path = /obj/item/food/slice/lemon_cake + slice_path = /obj/item/food/sliced/lemon_cake slices_num = 5 bitesize = 3 filling_color = "#FAFA8E" @@ -180,7 +180,7 @@ tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/lemon_cake +/obj/item/food/sliced/lemon_cake name = "lemon cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -195,7 +195,7 @@ desc = "A cake with added chocolate." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "chocolatecake" - slice_path = /obj/item/food/slice/chocolate_cake + slice_path = /obj/item/food/sliced/chocolate_cake slices_num = 5 bitesize = 3 filling_color = "#805930" @@ -203,7 +203,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/chocolate_cake +/obj/item/food/sliced/chocolate_cake name = "chocolate cake slice" desc = "Just a slice of cake, it is enough for everyone." icon = 'icons/obj/food/bakedgoods.dmi' @@ -218,7 +218,7 @@ desc = "Happy Birthday..." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "birthdaycake" - slice_path = /obj/item/food/slice/birthday_cake + slice_path = /obj/item/food/sliced/birthday_cake slices_num = 5 filling_color = "#FFD6D6" bitesize = 3 @@ -226,7 +226,7 @@ tastes = list("cake" = 5, "sweetness" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/birthday_cake +/obj/item/food/sliced/birthday_cake name = "birthday cake slice" desc = "A slice of your birthday!" icon = 'icons/obj/food/bakedgoods.dmi' @@ -241,7 +241,7 @@ desc = "A cake centered with Apple." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "applecake" - slice_path = /obj/item/food/slice/apple_cake + slice_path = /obj/item/food/sliced/apple_cake slices_num = 5 bitesize = 3 filling_color = "#EBF5B8" @@ -249,7 +249,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/apple_cake +/obj/item/food/sliced/apple_cake name = "apple cake slice" desc = "A slice of heavenly cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -264,7 +264,7 @@ desc = "A cake made for angels and chaplains alike! Contains holy water." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "holy_cake" - slice_path = /obj/item/food/slice/holy_cake + slice_path = /obj/item/food/sliced/holy_cake slices_num = 5 bitesize = 3 filling_color = "#ffffff" @@ -272,7 +272,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/holy_cake +/obj/item/food/sliced/holy_cake name = "holy cake slice" desc = "A slice of heavenly cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -287,7 +287,7 @@ desc = "A chocolate cake with five strawberries on top. For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "liars_cake" - slice_path = /obj/item/food/slice/liars + slice_path = /obj/item/food/sliced/liars slices_num = 5 bitesize = 3 filling_color = "#240606c7" @@ -295,7 +295,7 @@ tastes = list("blackberry" = 2, "strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/liars +/obj/item/food/sliced/liars name = "strawberry chocolate cake slice" desc = "Just a slice of cake with five strawberries on top. \ For some reason, this configuration of cake is particularly aesthetically pleasing to AIs in SELF." @@ -311,7 +311,7 @@ desc = "A plain cake, filled with assortment of blackberries and strawberries!" icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "vanilla_berry_cake" - slice_path = /obj/item/food/slice/vanilla_berry_cake + slice_path = /obj/item/food/sliced/vanilla_berry_cake slices_num = 5 bitesize = 3 filling_color = "#f0e3e3c7" @@ -319,7 +319,7 @@ tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/vanilla_berry_cake +/obj/item/food/sliced/vanilla_berry_cake name = "blackberry and strawberry vanilla cake slice" desc = "Just a slice of cake filled with assortment of blackberries and strawberries!" icon = 'icons/obj/food/bakedgoods.dmi' @@ -334,7 +334,7 @@ desc = "A \"cake\" that is made with electronic boards and leaks acid..." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "hardware_cake" - slice_path = /obj/item/food/slice/hardware_cake + slice_path = /obj/item/food/sliced/hardware_cake slices_num = 5 bitesize = 3 filling_color = "#4ac25e" @@ -342,7 +342,7 @@ tastes = list("acid" = 3, "metal" = 4, "glass" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/hardware_cake +/obj/item/food/sliced/hardware_cake name = "hardware cake slice" desc = "A slice of electronic boards and some acid." icon = 'icons/obj/food/bakedgoods.dmi' @@ -357,7 +357,7 @@ desc = "A cake centred with Plums." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "plum_cake" - slice_path = /obj/item/food/slice/plum_cake + slice_path = /obj/item/food/sliced/plum_cake slices_num = 5 bitesize = 3 filling_color = "#a128c5" @@ -365,7 +365,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/plum_cake +/obj/item/food/sliced/plum_cake name = "plum cake slice" desc = "A slice of plum cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -380,7 +380,7 @@ desc = "A condensed cake made for filling people up quickly." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pound_cake" - slice_path = /obj/item/food/slice/pound_cake + slice_path = /obj/item/food/sliced/pound_cake slices_num = 5 bitesize = 3 filling_color = "#c4cab7" @@ -388,7 +388,7 @@ tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/pound_cake +/obj/item/food/sliced/pound_cake name = "pound cake slice" desc = "A slice of condensed cake made for filling people up quickly." icon = 'icons/obj/food/bakedgoods.dmi' @@ -403,7 +403,7 @@ desc = "A hollow cake with real pumpkin." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkin_spice_cake" - slice_path = /obj/item/food/slice/pumpkin_spice_cake + slice_path = /obj/item/food/sliced/pumpkin_spice_cake slices_num = 5 bitesize = 3 filling_color = "#ee710a" @@ -411,7 +411,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/pumpkin_spice_cake +/obj/item/food/sliced/pumpkin_spice_cake name = "pumpkin spice cake slice" desc = "A spicy slice of pumpkin goodness." icon = 'icons/obj/food/bakedgoods.dmi' @@ -426,7 +426,7 @@ desc = "A cake made of slimes. Probably not electrified." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "slime_cake" - slice_path = /obj/item/food/slice/slime_cake + slice_path = /obj/item/food/sliced/slime_cake slices_num = 5 bitesize = 3 filling_color = "#0adfee" @@ -434,7 +434,7 @@ tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/slime_cake +/obj/item/food/sliced/slime_cake name = "slime cake slice" desc = "A slice of slime cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -449,7 +449,7 @@ desc = "A spaceman's trumpet frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "trumpet_cake" - slice_path = /obj/item/food/slice/spaceman_cake + slice_path = /obj/item/food/sliced/spaceman_cake slices_num = 5 bitesize = 3 filling_color = "#610977" @@ -457,7 +457,7 @@ tastes = list("cake" = 4, "violets" = 2, "jam" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/spaceman_cake +/obj/item/food/sliced/spaceman_cake name = "spaceman's cake slice" desc = "A slice of spaceman's trumpet frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -472,7 +472,7 @@ desc = "A vanilla frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "vanilla_cake" - slice_path = /obj/item/food/slice/vanilla_cake + slice_path = /obj/item/food/sliced/vanilla_cake slices_num = 5 bitesize = 3 filling_color = "#ece7ee" @@ -480,7 +480,7 @@ tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/vanilla_cake +/obj/item/food/sliced/vanilla_cake name = "vanilla cake slice" desc = "A slice of vanilla frosted cake." icon = 'icons/obj/food/bakedgoods.dmi' @@ -495,14 +495,14 @@ icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "mothmallow_tray" list_reagents = list("nutriment" = 20, "sugar" = 20) - slice_path = /obj/item/food/slice/mothmallow + slice_path = /obj/item/food/sliced/mothmallow slices_num = 5 bitesize = 3 filling_color = "#eebe98" tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/mothmallow +/obj/item/food/sliced/mothmallow name = "mothmallow" desc = "Fluffy little clouds of joy- in a strangely moth-like colour." icon = 'icons/obj/food/bakedgoods.dmi' @@ -690,7 +690,7 @@ desc = "A delicious treat for the autumn months." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "pumpkinpie" - slice_path = /obj/item/food/slice/pumpkinpie + slice_path = /obj/item/food/sliced/pumpkinpie slices_num = 5 bitesize = 3 filling_color = "#F5B951" @@ -698,7 +698,7 @@ tastes = list("pie" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/slice/pumpkinpie +/obj/item/food/sliced/pumpkinpie name = "pumpkin pie slice" desc = "A slice of pumpkin pie, with whipped cream on top. Perfection." icon = 'icons/obj/food/bakedgoods.dmi' @@ -723,7 +723,7 @@ desc = "An odd blue pie made with toxic blumpkin." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "blumpkin_pie" - slice_path = /obj/item/food/slice/blumpkin_pie + slice_path = /obj/item/food/sliced/blumpkin_pie slices_num = 5 bitesize = 3 filling_color = "#102d8b" @@ -731,7 +731,7 @@ tastes = list("pie" = 1, "a mouthful of pool water" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/slice/blumpkin_pie +/obj/item/food/sliced/blumpkin_pie name = "blumpkin pie slice" desc = "A slice of blumpkin pie, with whipped cream on top. Is this edible?" icon = 'icons/obj/food/bakedgoods.dmi' @@ -746,7 +746,7 @@ desc = "A decadent pie made of a creamy chocolate mousse filling topped with a layer of whipped cream and chocolate shavings. Sliceable." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "french_silk_pie" - slice_path = /obj/item/food/slice/french_silk_pie + slice_path = /obj/item/food/sliced/french_silk_pie slices_num = 5 bitesize = 3 filling_color = "#5e4337" @@ -754,7 +754,7 @@ tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/slice/french_silk_pie +/obj/item/food/sliced/french_silk_pie name = "french silk pie slice" desc = "A slice of french silk pie, filled with a chocolate mousse and topped with a layer of whipped cream and chocolate shavings. Delicious enough to make you cry." icon = 'icons/obj/food/bakedgoods.dmi' @@ -769,7 +769,7 @@ desc = "Tastes like blue and cold." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "frosty_pie" - slice_path = /obj/item/food/slice/frosty_pie + slice_path = /obj/item/food/sliced/frosty_pie slices_num = 5 bitesize = 3 filling_color = "#5e4337" @@ -777,7 +777,7 @@ tastes = list("mint" = 1, "pie" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/slice/frosty_pie +/obj/item/food/sliced/frosty_pie name = "frosty pie slice" desc = "Tasty blue, like my favourite crayon!" icon = 'icons/obj/food/bakedgoods.dmi' @@ -1325,7 +1325,7 @@ desc = "A delicious jelly made with sweet potatoes." icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "dulce_de_batata" - slice_path = /obj/item/food/slice/dulce_de_batata + slice_path = /obj/item/food/sliced/dulce_de_batata slices_num = 5 bitesize = 3 filling_color = "#411b02" @@ -1333,7 +1333,7 @@ tastes = list("jelly" = 1, "sweet potato" = 1) goal_difficulty = FOOD_GOAL_NORMAL -/obj/item/food/slice/dulce_de_batata +/obj/item/food/sliced/dulce_de_batata name = "dulce de batata slice" desc = "Tasty blue, like my favourite crayon!" icon = 'icons/obj/food/bakedgoods.dmi' diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 435cb491f46c..8d95c41ba93d 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -8,14 +8,14 @@ desc = "The culinary base of every self-respecting eloquen/tg/entleman." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbread" - slice_path = /obj/item/food/slice/meat_bread + slice_path = /obj/item/food/sliced/meat_bread slices_num = 5 filling_color = "#FF7575" list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5) tastes = list("bread" = 10, "meat" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/meat_bread +/obj/item/food/sliced/meat_bread name = "meatbread slice" desc = "A slice of delicious meatbread." icon = 'icons/obj/food/burgerbread.dmi' @@ -28,14 +28,14 @@ desc = "The culinary base of every self-respecting eloquent gentleman. Extra Heretical." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenomeatbread" - slice_path = /obj/item/food/slice/xeno_meat_bread + slice_path = /obj/item/food/sliced/xeno_meat_bread slices_num = 5 filling_color = "#8AFF75" list_reagents = list("protein" = 20, "nutriment" = 10, "vitamin" = 5) tastes = list("bread" = 10, "acid" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/xeno_meat_bread +/obj/item/food/sliced/xeno_meat_bread name = "xenomeatbread slice" desc = "A slice of delicious meatbread. Extra Heretical." icon = 'icons/obj/food/burgerbread.dmi' @@ -48,13 +48,13 @@ desc = "Reassuringly green meatloaf made from spider meat." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatbread" - slice_path = /obj/item/food/slice/spider_meat_bread + slice_path = /obj/item/food/sliced/spider_meat_bread slices_num = 5 list_reagents = list("protein" = 20, "nutriment" = 10, "toxin" = 15, "vitamin" = 5) tastes = list("bread" = 10, "cobwebs" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/spider_meat_bread +/obj/item/food/sliced/spider_meat_bread name = "spider meat bread slice" desc = "A slice of meatloaf made from an animal that most likely still wants you dead." icon = 'icons/obj/food/burgerbread.dmi' @@ -68,14 +68,14 @@ desc = "A heavenly and filling treat." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabread" - slice_path = /obj/item/food/slice/banana_bread + slice_path = /obj/item/food/sliced/banana_bread slices_num = 5 filling_color = "#EDE5AD" list_reagents = list("banana" = 20, "nutriment" = 20) tastes = list("bread" = 10, "banana" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/banana_bread +/obj/item/food/sliced/banana_bread name = "banana-nut bread slice" desc = "A slice of delicious banana bread." icon = 'icons/obj/food/burgerbread.dmi' @@ -89,14 +89,14 @@ desc = "Like meatbread but for vegetarians. Not guaranteed to give superpowers." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubread" - slice_path = /obj/item/food/slice/tofu_bread + slice_path = /obj/item/food/sliced/tofu_bread slices_num = 5 filling_color = "#F7FFE0" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("bread" = 10, "tofu" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/tofu_bread +/obj/item/food/sliced/tofu_bread name = "tofubread slice" desc = "A slice of delicious tofubread." icon = 'icons/obj/food/burgerbread.dmi' @@ -109,14 +109,14 @@ desc = "Some plain old Earthen bread." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bread" - slice_path = /obj/item/food/slice/bread + slice_path = /obj/item/food/sliced/bread slices_num = 6 filling_color = "#FFE396" list_reagents = list("nutriment" = 10) tastes = list("bread" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/bread +/obj/item/food/sliced/bread name = "bread slice" desc = "A slice of home." icon = 'icons/obj/food/burgerbread.dmi' @@ -131,14 +131,14 @@ desc = "Yum yum yum!" icon = 'icons/obj/food/burgerbread.dmi' icon_state = "creamcheesebread" - slice_path = /obj/item/food/slice/cream_cheese_bread + slice_path = /obj/item/food/sliced/cream_cheese_bread slices_num = 5 filling_color = "#FFF896" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("bread" = 10, "cheese" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/cream_cheese_bread +/obj/item/food/sliced/cream_cheese_bread name = "cream cheese bread slice" desc = "A slice of yum!" icon = 'icons/obj/food/burgerbread.dmi' @@ -153,14 +153,14 @@ desc = "A loaf of delicious mah'weyh pleggh at e'ntrath!" icon = 'icons/obj/food/burgerbread.dmi' icon_state = "banarnarbread" - slice_path = /obj/item/food/slice/banarnarbread + slice_path = /obj/item/food/sliced/banarnarbread slices_num = 5 filling_color = "#6F0000" list_reagents = list("nutriment" = 20, "vitamin" = 5) tastes = list("heresy" = 10, "banana" = 10) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/banarnarbread +/obj/item/food/sliced/banarnarbread name = "banarnarbread slice" desc = "A slice of delicious mah'weyh pleggh at e'ntrath!" icon = 'icons/obj/food/burgerbread.dmi' diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index e34a3158eb38..ee45dd385fc9 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -41,13 +41,13 @@ name = "cheese wheel" desc = "A big wheel of delicious Cheddar." icon_state = "cheesewheel" - slice_path = /obj/item/food/slice/cheesewedge + slice_path = /obj/item/food/sliced/cheesewedge slices_num = 5 filling_color = "#FFF700" list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20) tastes = list("cheese" = 1) -/obj/item/food/slice/cheesewedge +/obj/item/food/sliced/cheesewedge name = "cheese wedge" desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" @@ -58,12 +58,12 @@ name = "smoked cheese wheel" desc = "A wheel of fancy imported-style smoked cheese." icon_state = "cheesewheel-smoked" - slice_path = /obj/item/food/slice/cheesewedge/smoked + slice_path = /obj/item/food/sliced/cheesewedge/smoked slices_num = 4 list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15) tastes = list("cheese" = 1, "smoke" = 2) -/obj/item/food/slice/cheesewedge/smoked +/obj/item/food/sliced/cheesewedge/smoked name = "smoked cheese wedge" desc = "A wedge of fancy smoked cheese." icon_state = "cheesewedge-smoked" @@ -73,12 +73,12 @@ name = "edam cheese wheel" desc = "A wheel of mild edam cheese." icon_state = "cheesewheel-edam" - slice_path = /obj/item/food/slice/cheesewedge/edam + slice_path = /obj/item/food/sliced/cheesewedge/edam slices_num = 4 list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15) tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2) -/obj/item/food/slice/cheesewedge/edam +/obj/item/food/sliced/cheesewedge/edam name = "edam cheese wedge" desc = "A wedge of mild edam cheese. It's said to have a nutty flavor." icon_state = "cheesewedge-edam" @@ -88,12 +88,12 @@ name = "blue cheese wheel" desc = "A wheel of pungent blue cheese. It's an acquired taste..." icon_state = "cheesewheel-blue" - slice_path = /obj/item/food/slice/cheesewedge/blue + slice_path = /obj/item/food/sliced/cheesewedge/blue slices_num = 5 list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 10) tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1) -/obj/item/food/slice/cheesewedge/blue +/obj/item/food/sliced/cheesewedge/blue name = "blue cheese wedge" desc = "A wedge of pungent blue cheese. The flavor is... intense." icon_state = "cheesewedge-blue" @@ -104,24 +104,24 @@ name = "camembert cheese wheel" desc = "A miniature wheel of gooey camembert. Yum..." icon_state = "cheesewheel-camembert" - slice_path = /obj/item/food/slice/cheesewedge/camembert + slice_path = /obj/item/food/sliced/cheesewedge/camembert slices_num = 2 list_reagents = list("nutriment" = 1, "vitamin" = 2, "cheese" = 6) tastes = list("mild cheese" = 3, "gooeyness" = 1) -/obj/item/food/slice/cheesewedge/camembert +/obj/item/food/sliced/cheesewedge/camembert name = "camembert cheese slice" desc = "A piece of camembert. It's soft and gooey." icon_state = "cheesewedge-camembert" bitesize = 2 tastes = list("mild cheese" = 3, "gooeyness" = 1) -/obj/item/food/slice/cheesewedge/checkpass(passflag) +/obj/item/food/sliced/cheesewedge/checkpass(passflag) if((passflag & PASSDOOR) && ismouse(pulledby)) return TRUE return ..() -/obj/item/food/slice/cheesewedge/presliced +/obj/item/food/sliced/cheesewedge/presliced list_reagents = list("nutriment" = 3, "vitamin" = 1, "cheese" = 4) /obj/item/food/weirdcheesewedge @@ -151,14 +151,14 @@ list_reagents = list("plantmatter" = 3, "vitamin" = 1) tastes = list("mushroom" = 1) -/obj/item/food/slice/watermelon +/obj/item/food/sliced/watermelon name = "watermelon slice" desc = "A slice of watery goodness." icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#FF3867" tastes = list("watermelon" = 1) -/obj/item/food/slice/tomato +/obj/item/food/sliced/tomato name = "tomato slice" desc = "A fresh slice of tomato." icon_state = "tomatoslice" @@ -166,7 +166,7 @@ list_reagents = list("plantmatter" = 2) tastes = list("tomato" = 1) -/obj/item/food/slice/pineapple +/obj/item/food/sliced/pineapple name = "pineapple slices" desc = "Rings of pineapple." icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. @@ -204,13 +204,13 @@ desc = "Some flattened dough." icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "flat dough" - slice_path = /obj/item/food/slice/dough + slice_path = /obj/item/food/sliced/dough slices_num = 3 list_reagents = list("nutriment" = 6) tastes = list("dough" = 1) -/obj/item/food/slice/dough +/obj/item/food/sliced/dough name = "dough slice" desc = "The building block of an impressive dish." icon = 'icons/obj/food/food_ingredients.dmi' diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index 7ce680024a54..135cea76fdb7 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -564,13 +564,13 @@ desc = "A traditional turkey served with stuffing." icon = 'icons/obj/food/meat.dmi' icon_state = "turkey" - slice_path = /obj/item/food/slice/turkey + slice_path = /obj/item/food/sliced/turkey slices_num = 6 list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5) tastes = list("turkey" = 2, "stuffing" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/turkey +/obj/item/food/sliced/turkey name = "turkey serving" desc = "A serving of some tender and delicious turkey." icon = 'icons/obj/food/meat.dmi' diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index 044fd036ec0e..df684cccf4a0 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -14,11 +14,11 @@ name = "margherita pizza" desc = "The golden standard of pizzas." icon_state = "margheritapizza" - slice_path = /obj/item/food/slice/margherita_pizza + slice_path = /obj/item/food/sliced/margherita_pizza list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/margherita_pizza +/obj/item/food/sliced/margherita_pizza name = "margherita slice" desc = "A slice of the classic pizza." icon = 'icons/obj/food/pizza.dmi' @@ -32,12 +32,12 @@ name = "meat pizza" desc = "A pizza with meat topping." icon_state = "meatpizza" - slice_path = /obj/item/food/slice/meat_pizza + slice_path = /obj/item/food/sliced/meat_pizza list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) tastes = list("crust" = 1, "cheese" = 1, "meat" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/meat_pizza +/obj/item/food/sliced/meat_pizza name = "meat pizza slice" desc = "A slice of a meaty pizza." icon = 'icons/obj/food/pizza.dmi' @@ -51,12 +51,12 @@ name = "mushroom pizza" desc = "Very special pizza." icon_state = "mushroompizza" - slice_path = /obj/item/food/slice/mushroom_pizza + slice_path = /obj/item/food/sliced/mushroom_pizza list_reagents = list("plantmatter" = 30, "vitamin" = 5) tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/mushroom_pizza +/obj/item/food/sliced/mushroom_pizza name = "mushroom pizza slice" desc = "Maybe it is the last slice of pizza in your life." icon = 'icons/obj/food/pizza.dmi' @@ -70,12 +70,12 @@ name = "vegetable pizza" desc = "No Tomato Sapiens were harmed during the making of this pizza." icon_state = "vegetablepizza" - slice_path = /obj/item/food/slice/vegetable_pizza + slice_path = /obj/item/food/sliced/vegetable_pizza list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/vegetable_pizza +/obj/item/food/sliced/vegetable_pizza name = "vegetable pizza slice" desc = "A slice of the most green pizza of all pizzas not containing green ingredients." icon = 'icons/obj/food/pizza.dmi' @@ -89,12 +89,12 @@ name = "hawaiian pizza" desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple." icon_state = "hawaiianpizza" - slice_path = /obj/item/food/slice/hawaiian_pizza + slice_path = /obj/item/food/sliced/hawaiian_pizza list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5) tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/hawaiian_pizza +/obj/item/food/sliced/hawaiian_pizza name = "hawaiian pizza slice" desc = "A slice of polarising pizza." icon = 'icons/obj/food/pizza.dmi' @@ -108,13 +108,13 @@ name = "mac 'n' cheese pizza" desc = "Gastronomists have yet to classify this dish as 'pizza'." icon_state = "macpizza" - slice_path = /obj/item/food/slice/mac_pizza + slice_path = /obj/item/food/sliced/mac_pizza list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious filling_color = "#ffe45d" tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/mac_pizza +/obj/item/food/sliced/mac_pizza name = "mac 'n' cheese pizza slice" desc = "A delicious slice of pizza topped with macaroni & cheese... wait, what the hell? Who would do this?!" icon = 'icons/obj/food/pizza.dmi' @@ -128,13 +128,13 @@ name = "pepperoni pizza" desc = "What did the pepperoni say to the pizza?" icon_state = "pepperonipizza" - slice_path = /obj/item/food/slice/pepperoni_pizza + slice_path = /obj/item/food/sliced/pepperoni_pizza list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) filling_color = "#ffe45d" tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/pepperoni_pizza +/obj/item/food/sliced/pepperoni_pizza name = "pepperoni pizza slice" desc = "Nice to meat you!" icon = 'icons/obj/food/pizza.dmi' @@ -148,11 +148,11 @@ name = "cheese pizza" desc = "Cheese, bread, cheese, tomato, and cheese." icon_state = "cheesepizza" - slice_path = /obj/item/food/slice/cheese_pizza + slice_path = /obj/item/food/sliced/cheese_pizza list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/cheese_pizza +/obj/item/food/sliced/cheese_pizza name = "cheese pizza slice" desc = "Dangerously cheesy?" icon = 'icons/obj/food/pizza.dmi' @@ -166,12 +166,12 @@ name = "donk-pocket pizza" desc = "Who thought this would be a good idea?" icon_state = "donkpocketpizza" - slice_path = /obj/item/food/slice/donk_pocket_pizza + slice_path = /obj/item/food/sliced/donk_pocket_pizza list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6) tastes = list("crust" = 1, "meat" = 1, "laziness" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/donk_pocket_pizza +/obj/item/food/sliced/donk_pocket_pizza name = "donk-pocket pizza slice" desc = "Smells like lukewarm donk-pocket." icon = 'icons/obj/food/pizza.dmi' @@ -185,12 +185,12 @@ name = "dank pizza" desc = "The hippie's pizza of choice." icon_state = "dankpizza" - slice_path = /obj/item/food/slice/dank_pizza + slice_path = /obj/item/food/sliced/dank_pizza list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6) tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/dank_pizza +/obj/item/food/sliced/dank_pizza name = "dank pizza slice" desc = "So good, man..." icon = 'icons/obj/food/pizza.dmi' @@ -204,12 +204,12 @@ name = "firecracker pizza" desc = "Tastes HOT HOT HOT!" icon_state = "firecrackerpizza" - slice_path = /obj/item/food/slice/fire_cracker_pizza + slice_path = /obj/item/food/sliced/fire_cracker_pizza list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12) tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/fire_cracker_pizza +/obj/item/food/sliced/fire_cracker_pizza name = "firecracker pizza slice" desc = "A spicy slice of something quite nice." icon = 'icons/obj/food/pizza.dmi' @@ -223,12 +223,12 @@ name = "\"pesto\" pizza" desc = "Wait a second...this doesn't taste like pesto!" icon_state = "pestopizza" - slice_path = /obj/item/food/slice/pesto_pizza + slice_path = /obj/item/food/sliced/pesto_pizza list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12) tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/pesto_pizza +/obj/item/food/sliced/pesto_pizza name = "\"pesto\" pizza slice" desc = "Delicious and suspicious(ly green)." icon = 'icons/obj/food/pizza.dmi' diff --git a/code/modules/food_and_drinks/food/foods/seafood.dm b/code/modules/food_and_drinks/food/foods/seafood.dm index 71302ad591c0..e5e09a54ef3f 100644 --- a/code/modules/food_and_drinks/food/foods/seafood.dm +++ b/code/modules/food_and_drinks/food/foods/seafood.dm @@ -188,14 +188,14 @@ desc = "A large unsliced roll of Sake Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Sake_maki" - slice_path = /obj/item/food/slice/sushi_sake + slice_path = /obj/item/food/sliced/sushi_sake slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("raw salmon" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_sake +/obj/item/food/sliced/sushi_sake name = "sake sushi" desc = "A simple sushi consisting of raw salmon and rice." icon = 'icons/obj/food/seafood.dmi' @@ -210,14 +210,14 @@ desc = "A large unsliced roll of Smoked Salmon Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "SmokedSalmon_maki" - slice_path = /obj/item/food/slice/sushi_smoked_salmon + slice_path = /obj/item/food/sliced/sushi_smoked_salmon slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("smoked salmon" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_smoked_salmon +/obj/item/food/sliced/sushi_smoked_salmon name = "smoked salmon sushi" desc = "A simple sushi consisting of cooked salmon and rice." icon = 'icons/obj/food/seafood.dmi' @@ -232,14 +232,14 @@ desc = "A large unsliced roll of Tamago Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Tamago_maki" - slice_path = /obj/item/food/slice/sushi_tamago + slice_path = /obj/item/food/sliced/sushi_tamago slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("egg" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_tamago +/obj/item/food/sliced/sushi_tamago name = "tamago sushi" desc = "A simple sushi consisting of egg and rice." icon = 'icons/obj/food/seafood.dmi' @@ -254,14 +254,14 @@ desc = "A large unsliced roll of Inari Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Inari_maki" - slice_path = /obj/item/food/slice/sushi_inari + slice_path = /obj/item/food/sliced/sushi_inari slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("fried tofu" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_inari +/obj/item/food/sliced/sushi_inari name = "inari sushi" desc = "A piece of fried tofu stuffed with rice." icon = 'icons/obj/food/seafood.dmi' @@ -276,14 +276,14 @@ desc = "A large unsliced roll of Masago Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Masago_maki" - slice_path = /obj/item/food/slice/sushi_masago + slice_path = /obj/item/food/sliced/sushi_masago slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) tastes = list("goldfish roe" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_masago +/obj/item/food/sliced/sushi_masago name = "masago sushi" desc = "A simple sushi consisting of goldfish roe." icon = 'icons/obj/food/seafood.dmi' @@ -298,14 +298,14 @@ desc = "A large unsliced roll of Tobkio Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Tobiko_maki" - slice_path = /obj/item/food/slice/sushi_tobiko + slice_path = /obj/item/food/sliced/sushi_tobiko slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) tastes = list("shark roe" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_tobiko +/obj/item/food/sliced/sushi_tobiko name = "tobiko sushi" desc = "A simple sushi consisting of shark roe." icon = 'icons/obj/food/seafood.dmi' @@ -320,14 +320,14 @@ desc = "A large unsliced roll of Tobkio and Egg Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "TobikoEgg_maki" - slice_path = /obj/item/food/slice/sushi_tobiko_egg + slice_path = /obj/item/food/sliced/sushi_tobiko_egg slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8, "protein" = 4) tastes = list("shark roe" = 1, "rice" = 1, "egg" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_tobiko_egg +/obj/item/food/sliced/sushi_tobiko_egg name = "tobiko and egg sushi" desc = "A sushi consisting of shark roe and an egg." icon = 'icons/obj/food/seafood.dmi' @@ -342,14 +342,14 @@ desc = "A large unsliced roll of Tai Sushi." icon = 'icons/obj/food/seafood.dmi' icon_state = "Tai_maki" - slice_path = /obj/item/food/slice/sushi_tai + slice_path = /obj/item/food/sliced/sushi_tai slices_num = 4 bitesize = 3 list_reagents = list("nutriment" = 8) tastes = list("catfish" = 1, "rice" = 1, "seaweed" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE -/obj/item/food/slice/sushi_tai +/obj/item/food/sliced/sushi_tai name = "tai sushi" desc = "A simple sushi consisting of catfish and rice." icon = 'icons/obj/food/seafood.dmi' diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index a069cf1679f1..d53a526a2d26 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -276,12 +276,13 @@ W.consume(src) //MARK: SLICE -/obj/item/food/slice +/obj/item/food/sliced var/test = 3 -/obj/item/food/slice/Initialize(mapload, var/list/parent_reagents) - if(!parent_reagents) - log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") +/obj/item/food/sliced/Initialize(mapload, parent_reagents) + if(!parent_reagents && !list_reagents) + //log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") + CRASH("Slice was created with no reagents! [src]") list_reagents = parent_reagents return ..() @@ -290,7 +291,7 @@ slices_num = 2 /obj/item/food/sliceable/Initialize(mapload) - if(!istype(slice_path, /obj/item/food/slice)) + if(!istype(slice_path, /obj/item/food/sliced)) CRASH("Invalid type assigned to slice_path: [slice_path]") return ..() @@ -351,10 +352,9 @@ slices_lost = rand(1, min(1, round(slices_num / 2))) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i in 1 to (slices_num - slices_lost)) - if(!istype(slice_path, /obj/item/food/slice)) + if(!istype(slice_path, /obj/item/food/sliced)) CRASH("Invalid type assigned to slice_path: [slice_path]") - return - var/obj/item/food/slice/slice = new slice_path (loc,reagents_per_slice) + var/obj/item/food/sliced/slice = new slice_path (loc,reagents_per_slice) slice.pixel_x = rand(-7, 7) slice.pixel_y = rand(-7, 7) qdel(src) diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 2864dbc21c95..1d00b3975626 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -189,7 +189,7 @@ output = /obj/item/food/carrotfries /datum/deepfryer_special/onionrings - input = /obj/item/food/slice/onion_slice + input = /obj/item/food/sliced/onion_slice output = /obj/item/food/onionrings /datum/deepfryer_special/fried_vox diff --git a/code/modules/food_and_drinks/kitchen_machinery/processor.dm b/code/modules/food_and_drinks/kitchen_machinery/processor.dm index 5f0337466d0b..b77ab73200da 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/processor.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/processor.dm @@ -105,7 +105,7 @@ output = /obj/item/food/soydope /datum/food_processor_process/spaghetti - input = /obj/item/food/slice/dough + input = /obj/item/food/sliced/dough output = /obj/item/food/spaghetti /datum/food_processor_process/macaroni diff --git a/code/modules/food_and_drinks/recipes/recipes_candy.dm b/code/modules/food_and_drinks/recipes/recipes_candy.dm index 69aba58789fc..03d1e7ba02f0 100644 --- a/code/modules/food_and_drinks/recipes/recipes_candy.dm +++ b/code/modules/food_and_drinks/recipes/recipes_candy.dm @@ -90,7 +90,7 @@ /datum/recipe/candy/candied_pineapple reagents = list("sugar" = 2, "water" = 2) items = list( - /obj/item/food/slice/pineapple + /obj/item/food/sliced/pineapple ) result = /obj/item/food/candy/candied_pineapple diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm index 1bca7fd7df7f..2b432889fc74 100644 --- a/code/modules/food_and_drinks/recipes/recipes_grill.dm +++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm @@ -75,9 +75,9 @@ /datum/recipe/grill/grilledcheese items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread, + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/grilledcheese @@ -112,8 +112,8 @@ items = list( /obj/item/food/egg, /obj/item/food/egg, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/omelette @@ -179,7 +179,7 @@ /obj/item/food/boiledrice, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_tamago + result = /obj/item/food/sliced/sushi_tamago /datum/recipe/grill/sushi_unagi reagents = list("sake" = 5) @@ -212,7 +212,7 @@ /obj/item/food/fried_tofu, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_inari + result = /obj/item/food/sliced/sushi_inari /datum/recipe/grill/sushi_sake items = list( @@ -220,7 +220,7 @@ /obj/item/food/salmonmeat, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_sake + result = /obj/item/food/sliced/sushi_sake /datum/recipe/grill/sushi_smoked_salmon items = list( @@ -228,7 +228,7 @@ /obj/item/food/salmonsteak, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_smoked_salmon + result = /obj/item/food/sliced/sushi_smoked_salmon /datum/recipe/grill/sushi_masago items = list( @@ -236,7 +236,7 @@ /obj/item/fish_eggs/goldfish, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_masago + result = /obj/item/food/sliced/sushi_masago /datum/recipe/grill/sushi_tobiko items = list( @@ -244,15 +244,15 @@ /obj/item/fish_eggs/shark, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_tobiko + result = /obj/item/food/sliced/sushi_tobiko /datum/recipe/grill/sushi_tobiko_egg items = list( - /obj/item/food/slice/sushi_tobiko, + /obj/item/food/sliced/sushi_tobiko, /obj/item/food/egg, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_tobiko_egg + result = /obj/item/food/sliced/sushi_tobiko_egg /datum/recipe/grill/sushi_tai items = list( @@ -260,7 +260,7 @@ /obj/item/food/catfishmeat, /obj/item/stack/seaweed ) - result = /obj/item/food/slice/sushi_tai + result = /obj/item/food/sliced/sushi_tai /datum/recipe/grill/goliath items = list(/obj/item/food/monstermeat/goliath) diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 9e703170ab52..433cf5e8341a 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -330,7 +330,7 @@ /obj/item/food/meat, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/burger/bigbite @@ -340,9 +340,9 @@ /obj/item/food/burger/bigbite, /obj/item/food/dough, /obj/item/food/meat, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/bacon, - /obj/item/food/slice/tomato + /obj/item/food/sliced/tomato ) result = /obj/item/food/burger/superbite @@ -419,7 +419,7 @@ /obj/item/food/bun, /obj/item/food/meat, /obj/item/food/grown/lettuce, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/burger/cheese @@ -459,7 +459,7 @@ /obj/item/food/bacon, /obj/item/food/bacon, /obj/item/food/grown/lettuce, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/burger/bacon @@ -467,7 +467,7 @@ items = list( /obj/item/food/bun, /obj/item/food/bbqribs, - /obj/item/food/slice/onion_slice + /obj/item/food/sliced/onion_slice ) result = /obj/item/food/burger/mcrib @@ -510,8 +510,8 @@ /datum/recipe/microwave/eggplantparm items = list( - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/eggplant ) result = /obj/item/food/eggplantparm @@ -541,7 +541,7 @@ /datum/recipe/microwave/cheesyfries items = list( /obj/item/food/fries, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/cheesyfries @@ -656,7 +656,7 @@ items = list( /obj/item/food/cutlet, /obj/item/food/beans, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/sliceable/flatdough ) result = /obj/item/food/burrito @@ -684,9 +684,9 @@ /datum/recipe/microwave/sandwich items = list( /obj/item/food/meatsteak, - /obj/item/food/slice/bread, - /obj/item/food/slice/bread, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread, + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/sandwich @@ -713,14 +713,14 @@ /datum/recipe/microwave/slimetoast reagents = list("slimejelly" = 5) items = list( - /obj/item/food/slice/bread, + /obj/item/food/sliced/bread, ) result = /obj/item/food/jelliedtoast/slime /datum/recipe/microwave/jelliedtoast reagents = list("cherryjelly" = 5) items = list( - /obj/item/food/slice/bread + /obj/item/food/sliced/bread ) result = /obj/item/food/jelliedtoast/cherry @@ -797,7 +797,7 @@ /datum/recipe/microwave/macncheese reagents = list("water" = 5, "milk" = 5) items = list( - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/macaroni, ) result = /obj/item/food/macncheese @@ -808,8 +808,8 @@ /obj/item/food/bun, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/lettuce, /obj/item/food/grown/chili, /obj/item/toy/crayon/green, @@ -819,10 +819,10 @@ /datum/recipe/microwave/blt items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread, + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread, /obj/item/food/grown/lettuce, - /obj/item/food/slice/tomato, + /obj/item/food/sliced/tomato, /obj/item/food/bacon ) result = /obj/item/food/blt @@ -830,34 +830,34 @@ /datum/recipe/microwave/peanut_butter_jelly/cherry reagents = list("cherryjelly" = 5, "peanutbutter" = 5) items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread ) result = /obj/item/food/peanut_butter_jelly/cherry /datum/recipe/microwave/peanut_butter_jelly/slime reagents = list("slimejelly" = 5, "peanutbutter" = 5) items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread ) result = /obj/item/food/peanut_butter_jelly/slime /datum/recipe/microwave/peanut_butter_banana reagents = list("peanutbutter" = 5) items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread, + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread, /obj/item/food/grown/banana ) result = /obj/item/food/peanut_butter_banana /datum/recipe/microwave/philly_cheesesteak items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread, + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread, /obj/item/food/cutlet, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/onion ) result = /obj/item/food/philly_cheesesteak @@ -967,24 +967,24 @@ /datum/recipe/microwave/twobread reagents = list("wine" = 5) items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread ) result = /obj/item/food/twobread /datum/recipe/microwave/slimesandwich reagents = list("slimejelly" = 5) items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread ) result = /obj/item/food/jellysandwich/slime /datum/recipe/microwave/cherrysandwich reagents = list("cherryjelly" = 5) items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread ) result = /obj/item/food/jellysandwich/cherry @@ -1049,7 +1049,7 @@ reagents = list("water" = 10) items = list( /obj/item/food/grown/onion, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/soup/frenchonionsoup @@ -1179,7 +1179,7 @@ /obj/item/food/badrecipe, /obj/item/food/tofu, /obj/item/food/egg, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/soup/mysterysoup @@ -1220,7 +1220,7 @@ /obj/item/food/grown/olive, /obj/item/food/grown/tomato, /obj/item/food/cutlet, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/salad/antipasto @@ -1228,9 +1228,9 @@ reagents = list("oliveoil" = 5) items = list( /obj/item/food/grown/lettuce, - /obj/item/food/slice/onion_slice/red, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/bread + /obj/item/food/sliced/onion_slice/red, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/bread ) result = /obj/item/food/salad/caesar @@ -1247,7 +1247,7 @@ /obj/item/food/grown/citrus/orange, /obj/item/food/grown/apple, /obj/item/food/grown/grapes, - /obj/item/food/slice/watermelon + /obj/item/food/sliced/watermelon ) result = /obj/item/food/salad/fruit @@ -1256,10 +1256,10 @@ items = list( /obj/item/food/grown/olive, /obj/item/food/grown/tomato, - /obj/item/food/slice/onion_slice/red, - /obj/item/food/slice/onion_slice/red, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/onion_slice/red, + /obj/item/food/sliced/onion_slice/red, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/salad/greek @@ -1269,8 +1269,8 @@ /obj/item/food/grown/grapes, /obj/item/food/grown/banana, /obj/item/food/grown/banana, - /obj/item/food/slice/watermelon, - /obj/item/food/slice/watermelon + /obj/item/food/sliced/watermelon, + /obj/item/food/sliced/watermelon ) result = /obj/item/food/salad/jungle @@ -1279,8 +1279,8 @@ items = list( /obj/item/food/grown/carrot, /obj/item/food/grown/lettuce, - /obj/item/food/slice/onion_slice/red, - /obj/item/food/slice/onion_slice/red + /obj/item/food/sliced/onion_slice/red, + /obj/item/food/sliced/onion_slice/red ) result = /obj/item/food/salad/kale @@ -1365,7 +1365,7 @@ items = list( /obj/item/food/friedegg, /obj/item/food/meatsteak, - /obj/item/food/slice/bread + /obj/item/food/sliced/bread ) result = /obj/item/food/benedict @@ -1474,7 +1474,7 @@ /datum/recipe/microwave/frozenpineapplepop items = list( /obj/item/popsicle_stick, - /obj/item/food/slice/pineapple, + /obj/item/food/sliced/pineapple, /obj/item/food/chocolatebar ) result = /obj/item/food/frozen/popsicle/frozenpineapple @@ -1647,8 +1647,8 @@ /datum/recipe/microwave/notasandwich items = list( - /obj/item/food/slice/bread, - /obj/item/food/slice/bread, + /obj/item/food/sliced/bread, + /obj/item/food/sliced/bread, /obj/item/clothing/mask/fakemoustache ) result = /obj/item/food/notasandwich @@ -1720,9 +1720,9 @@ /datum/recipe/microwave/taco items = list( - /obj/item/food/slice/dough, + /obj/item/food/sliced/dough, /obj/item/food/cutlet, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/taco diff --git a/code/modules/food_and_drinks/recipes/recipes_oven.dm b/code/modules/food_and_drinks/recipes/recipes_oven.dm index 8fcaa46f1b6c..8dacef0d42d3 100644 --- a/code/modules/food_and_drinks/recipes/recipes_oven.dm +++ b/code/modules/food_and_drinks/recipes/recipes_oven.dm @@ -16,9 +16,9 @@ /obj/item/food/meat, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, ) result = /obj/item/food/sliceable/meatbread @@ -30,9 +30,9 @@ /obj/item/food/meat/syntiflesh, /obj/item/food/meat/syntiflesh, /obj/item/food/meat/syntiflesh, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, ) result = /obj/item/food/sliceable/meatbread @@ -44,9 +44,9 @@ /obj/item/food/monstermeat/xenomeat, /obj/item/food/monstermeat/xenomeat, /obj/item/food/monstermeat/xenomeat, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, ) result = /obj/item/food/sliceable/xenomeatbread @@ -241,8 +241,8 @@ /obj/item/food/dough, /obj/item/food/dough, /obj/item/food/dough, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, ) result = /obj/item/food/sliceable/cheesecake @@ -444,15 +444,15 @@ /obj/item/food/tofu, /obj/item/food/tofu, /obj/item/food/tofu, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, ) result = /obj/item/food/sliceable/tofubread /datum/recipe/oven/loadedbakedpotato items = list( - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/potato ) result = /obj/item/food/loadedbakedpotato @@ -483,7 +483,7 @@ /datum/recipe/oven/fortunecookie reagents = list("sugar" = 5) items = list( - /obj/item/food/slice/dough, + /obj/item/food/sliced/dough, /obj/item/paper, ) result = /obj/item/food/fortunecookie @@ -505,8 +505,8 @@ /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/sliceable/pizza/margheritapizza @@ -516,7 +516,7 @@ /obj/item/food/meat, /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/tomato ) result = /obj/item/food/sliceable/pizza/meatpizza @@ -524,7 +524,7 @@ /datum/recipe/oven/mushroompizza items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/mushroom, /obj/item/food/grown/mushroom, /obj/item/food/grown/mushroom, @@ -537,7 +537,7 @@ /datum/recipe/oven/vegetablepizza items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/eggplant, /obj/item/food/grown/carrot, /obj/item/food/grown/corn, @@ -549,9 +549,9 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/pineapple, - /obj/item/food/slice/pineapple, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/pineapple, + /obj/item/food/sliced/pineapple, /obj/item/food/meat, ) result = /obj/item/food/sliceable/pizza/hawaiianpizza @@ -559,8 +559,8 @@ /datum/recipe/oven/macncheesepizza items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/macncheese, ) result = /obj/item/food/sliceable/pizza/macpizza @@ -569,10 +569,10 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/sliceable/pizza/cheesepizza @@ -580,7 +580,7 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/sausage ) result = /obj/item/food/sliceable/pizza/pepperonipizza @@ -589,7 +589,7 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/donkpocket, /obj/item/food/donkpocket ) @@ -599,7 +599,7 @@ items = list( /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/cannabis, /obj/item/food/grown/cannabis, /obj/item/food/grown/cannabis, @@ -611,7 +611,7 @@ reagents = list("capsaicin" = 5) items = list( /obj/item/food/sliceable/flatdough, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/chili, /obj/item/food/grown/chili ) @@ -623,7 +623,7 @@ /obj/item/food/sliceable/flatdough, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/sliceable/pizza/pestopizza @@ -633,7 +633,7 @@ /obj/item/food/sliceable/flatdough, /obj/item/food/grown/garlic, /obj/item/food/grown/garlic, - /obj/item/food/slice/cheesewedge + /obj/item/food/sliced/cheesewedge ) result = /obj/item/food/sliceable/pizza/garlicpizza @@ -662,8 +662,8 @@ items = list( /obj/item/food/dough, /obj/item/food/dough, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, ) result = /obj/item/food/sliceable/creamcheesebread @@ -814,7 +814,7 @@ /datum/recipe/oven/cracker reagents = list("sodiumchloride" = 1) items = list( - /obj/item/food/slice/dough + /obj/item/food/sliced/dough ) result = /obj/item/food/cracker @@ -859,9 +859,9 @@ items = list( /obj/item/food/meat, /obj/item/food/meat, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, - /obj/item/food/slice/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, + /obj/item/food/sliced/cheesewedge, /obj/item/food/grown/tomato, /obj/item/food/grown/tomato, /obj/item/food/dough diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm index 613b2e96934d..ef01ec7db2ac 100644 --- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm +++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_table.dm @@ -2,8 +2,8 @@ name = "Sandwich" reqs = list( /obj/item/food/meatsteak = 1, - /obj/item/food/slice/bread = 2, - /obj/item/food/slice/cheesewedge = 1, + /obj/item/food/sliced/bread = 2, + /obj/item/food/sliced/cheesewedge = 1, ) result = list(/obj/item/food/sandwich) category = CAT_FOOD @@ -13,7 +13,7 @@ name = "Slime Jelly Sandwich" reqs = list( /datum/reagent/slimejelly = 5, - /obj/item/food/slice/bread = 2, + /obj/item/food/sliced/bread = 2, ) result = list(/obj/item/food/jellysandwich/slime) category = CAT_FOOD @@ -23,7 +23,7 @@ name = "Cherry Jelly Sandwich" reqs = list( /datum/reagent/consumable/cherryjelly = 5, - /obj/item/food/slice/bread = 2, + /obj/item/food/sliced/bread = 2, ) result = list(/obj/item/food/jellysandwich/cherry) category = CAT_FOOD @@ -62,7 +62,7 @@ /datum/crafting_recipe/notasandwich name = "not-a-sandwich" reqs = list( - /obj/item/food/slice/bread = 2, + /obj/item/food/sliced/bread = 2, /obj/item/clothing/mask/fakemoustache = 1, ) result = list(/obj/item/food/notasandwich) @@ -122,7 +122,7 @@ /obj/item/food/fried_tofu = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_inari) + result = list(/obj/item/food/sliced/sushi_inari) category = CAT_FOOD subcategory = CAT_SUSHI @@ -145,7 +145,7 @@ /obj/item/food/salmonmeat = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_sake) + result = list(/obj/item/food/sliced/sushi_sake) category = CAT_FOOD subcategory = CAT_SUSHI @@ -168,7 +168,7 @@ /obj/item/food/salmonsteak = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_smoked_salmon) + result = list(/obj/item/food/sliced/sushi_smoked_salmon) category = CAT_FOOD subcategory = CAT_SUSHI @@ -191,7 +191,7 @@ /obj/item/fish_eggs/goldfish = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_masago) + result = list(/obj/item/food/sliced/sushi_masago) category = CAT_FOOD subcategory = CAT_SUSHI @@ -214,7 +214,7 @@ /obj/item/fish_eggs/shark = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_tobiko) + result = list(/obj/item/food/sliced/sushi_tobiko) category = CAT_FOOD subcategory = CAT_SUSHI @@ -233,18 +233,18 @@ /datum/crafting_recipe/sushi_tobiko_egg name = "Tobiko and Egg Sushi" reqs = list( - /obj/item/food/slice/sushi_tobiko = 1, + /obj/item/food/sliced/sushi_tobiko = 1, /obj/item/food/egg = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_tobiko_egg) + result = list(/obj/item/food/sliced/sushi_tobiko_egg) category = CAT_FOOD subcategory = CAT_SUSHI /datum/crafting_recipe/tobiko_egg_maki name = "Tobiko and Egg Maki Roll" reqs = list( - /obj/item/food/slice/sushi_tobiko = 4, + /obj/item/food/sliced/sushi_tobiko = 4, /obj/item/food/egg = 4, /obj/item/stack/seaweed = 1, ) @@ -260,7 +260,7 @@ /obj/item/food/catfishmeat = 1, /obj/item/stack/seaweed = 1, ) - result = list(/obj/item/food/slice/sushi_tai) + result = list(/obj/item/food/sliced/sushi_tai) category = CAT_FOOD subcategory = CAT_SUSHI diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index 382ce981ef84..e4bc12e46b1c 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -26,7 +26,7 @@ name = "watermelon" desc = "It's full of watery goodness." icon_state = "watermelon" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. - slice_path = /obj/item/food/slice/watermelon + slice_path = /obj/item/food/sliced/watermelon slices_num = 5 dried_type = null w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 07ae79edf1a9..ac2f8653b3b8 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -23,7 +23,7 @@ icon_state = "onion" filling_color = "#C0C9A0" bitesize_mod = 2 - slice_path = /obj/item/food/slice/onion_slice + slice_path = /obj/item/food/sliced/onion_slice tastes = list("onion" = 1, "pungentness" = 1) slices_num = 2 wine_power = 0.3 @@ -46,12 +46,12 @@ desc = "Purple despite the name." icon_state = "onion_red" filling_color = "#C29ACF" - slice_path = /obj/item/food/slice/onion_slice/red + slice_path = /obj/item/food/sliced/onion_slice/red tastes = list("red onion" = 1, "pungentness" = 3) wine_power = 0.6 wine_flavor = "powerful pungentness" -/obj/item/food/slice/onion_slice +/obj/item/food/sliced/onion_slice name = "onion slices" desc = "Rings, not for wearing." icon_state = "onionslice" @@ -61,7 +61,7 @@ gender = PLURAL cooked_type = /obj/item/food/onionrings -/obj/item/food/slice/onion_slice/red +/obj/item/food/sliced/onion_slice/red name = "red onion slices" desc = "They shine like exceptionally low quality amethyst." icon_state = "onionslice_red" diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index b8e06e7d0f2c..97aa3e54189c 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -25,7 +25,7 @@ attack_verb = list("stung", "pined") throw_speed = 1 throw_range = 5 - slice_path = /obj/item/food/slice/pineapple + slice_path = /obj/item/food/sliced/pineapple slices_num = 3 filling_color = "#F6CB0B" w_class = WEIGHT_CLASS_NORMAL diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index ec92c2ef971b..ef4dff749d88 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -19,7 +19,7 @@ name = "tomato" desc = "I say to-mah-to, you say tom-mae-to." icon_state = "tomato" - slice_path = /obj/item/food/slice/tomato + slice_path = /obj/item/food/sliced/tomato slices_num = 4 splat_type = /obj/effect/decal/cleanable/tomato_smudge filling_color = "#FF6347" diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm index a37052c75e27..67e9ea969b8a 100644 --- a/code/modules/mob/living/simple_animal/friendly/cat.dm +++ b/code/modules/mob/living/simple_animal/friendly/cat.dm @@ -235,7 +235,7 @@ butcher_results = list( /obj/item/organ/internal/brain = 1, /obj/item/organ/internal/heart = 1, - /obj/item/food/slice/birthday_cake = 3, + /obj/item/food/sliced/birthday_cake = 3, /obj/item/food/meat/slab = 2 ) response_harm = "takes a bite out of" diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm index 681117d1e4a0..b4b33ee76544 100644 --- a/code/modules/mob/living/simple_animal/friendly/mouse.dm +++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm @@ -100,7 +100,7 @@ ..() /mob/living/simple_animal/mouse/start_pulling(atom/movable/AM, state, force = pull_force, show_message = FALSE)//Prevents mouse from pulling things - if(istype(AM, /obj/item/food/slice/cheesewedge)) + if(istype(AM, /obj/item/food/sliced/cheesewedge)) return ..() // Get dem if(show_message) to_chat(src, "You are too small to pull anything except cheese.") diff --git a/code/modules/projectiles/guns/chaos_bolt.dm b/code/modules/projectiles/guns/chaos_bolt.dm index 3b74aa5b5e90..8785580b1c24 100644 --- a/code/modules/projectiles/guns/chaos_bolt.dm +++ b/code/modules/projectiles/guns/chaos_bolt.dm @@ -148,7 +148,7 @@ explosion(get_turf(H), 1, 1, 1, cause = "staff of chaos lethal explosion effect") if("cheese morphed") H.visible_message("[H] transforms into cheese!", "You've been transformed into cheese!") - new /obj/item/food/slice/cheesewedge(get_turf(H)) + new /obj/item/food/sliced/cheesewedge(get_turf(H)) qdel(H) if("supermattered") var/obj/machinery/atmospherics/supermatter_crystal/supercrystal = GLOB.main_supermatter_engine @@ -323,7 +323,7 @@ if("toy revolver") item_to_summon = /obj/item/gun/projectile/revolver/capgun/chaosprank if("cheese") - item_to_summon = /obj/item/food/slice/cheesewedge + item_to_summon = /obj/item/food/sliced/cheesewedge explosion_amount = rand(5, 10) if("food") target.visible_message("Food scatters around [target]!", "A bunch of food scatters around you!") diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm index c37b3c7e58c3..291e14081303 100644 --- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm +++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm @@ -70,7 +70,7 @@ /obj/item/food/grown/citrus/orange = list("orangejuice" = 0), /obj/item/food/grown/citrus/lime = list("limejuice" = 0), /obj/item/food/grown/watermelon = list("watermelonjuice" = 0), - /obj/item/food/slice/watermelon = list("watermelonjuice" = 0), + /obj/item/food/sliced/watermelon = list("watermelonjuice" = 0), /obj/item/food/grown/berries/poison = list("poisonberryjuice" = 0), /obj/item/food/grown/pumpkin/blumpkin = list("blumpkinjuice" = 0), // Order is important here as blumpkin is a subtype of pumpkin, if switched blumpkins will produce pumpkin juice /obj/item/food/grown/pumpkin = list("pumpkinjuice" = 0), diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 5146bcb64ec5..9e917f8ff719 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -635,7 +635,7 @@ /datum/reagent/consumable/cheese/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/item/food/slice/cheesewedge(T) + new /obj/item/food/sliced/cheesewedge(T) /datum/reagent/consumable/fake_cheese name = "Cheese substitute" @@ -925,7 +925,7 @@ /datum/reagent/consumable/bread/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/item/food/slice/bread(T) + new /obj/item/food/sliced/bread(T) /datum/reagent/soap name = "Soap" diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm index 1f6a655edad9..d290eba573c5 100644 --- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm +++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm @@ -150,21 +150,21 @@ var/list/blocked = list( /obj/item/food, - /obj/item/food/slice/bread, + /obj/item/food/sliced/bread, /obj/item/food/sliceable, /obj/item/food/sliceable/pizza, - /obj/item/food/slice/margherita_pizza, - /obj/item/food/slice/meat_pizza, - /obj/item/food/slice/mushroom_pizza, - /obj/item/food/slice/vegetable_pizza, - /obj/item/food/slice/cheese_pizza, + /obj/item/food/sliced/margherita_pizza, + /obj/item/food/sliced/meat_pizza, + /obj/item/food/sliced/mushroom_pizza, + /obj/item/food/sliced/vegetable_pizza, + /obj/item/food/sliced/cheese_pizza, /obj/item/food/garlic_pizza, - /obj/item/food/slice/donk_pocket_pizza, - /obj/item/food/slice/dank_pizza, - /obj/item/food/slice/mac_pizza, - /obj/item/food/slice/fire_cracker_pizza, - /obj/item/food/slice/pesto_pizza, - /obj/item/food/slice/pepperoni_pizza, + /obj/item/food/sliced/donk_pocket_pizza, + /obj/item/food/sliced/dank_pizza, + /obj/item/food/sliced/mac_pizza, + /obj/item/food/sliced/fire_cracker_pizza, + /obj/item/food/sliced/pesto_pizza, + /obj/item/food/sliced/pepperoni_pizza, /obj/item/food/meat, /obj/item/food/meat/slab, /obj/item/food/grown, diff --git a/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm b/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm index cfe398346b09..b243fa6a127e 100644 --- a/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm +++ b/code/modules/station_goals/secondary/kitchen/random_bulk_food.dm @@ -18,7 +18,7 @@ valid_food += candidate if(!valid_food) - food_type = /obj/item/food/slice/cheesewedge + food_type = /obj/item/food/sliced/cheesewedge amount = 50 return diff --git a/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt b/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt index 51c06aec4aa0..48037f390409 100644 --- a/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt +++ b/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt @@ -115,7 +115,7 @@ /obj/item/aiModule/protectStation/@SUBTYPES : /obj/item/ai_module/protect_station/@SUBTYPES{@OLD} /obj/item/food/sliceable/Ebi_maki/@SUBTYPES : /obj/item/food/sliceable/ebi_maki/@SUBTYPES{@OLD} /obj/item/food/sliceable/Tai_maki/@SUBTYPES : /obj/item/food/sliceable/tai_maki/@SUBTYPES{@OLD} -/obj/item/food/sushi_SmokedSalmon/@SUBTYPES : /obj/item/food/slice/sushi_smoked_salmon/@SUBTYPES{@OLD} +/obj/item/food/sushi_SmokedSalmon/@SUBTYPES : /obj/item/food/sliced/sushi_smoked_salmon/@SUBTYPES{@OLD} /area/ruin/unpowered/BMPship/Aft/@SUBTYPES : /area/ruin/unpowered/bmp_ship/aft/@SUBTYPES{@OLD} /datum/crafting_recipe/Sake_maki/@SUBTYPES : /datum/crafting_recipe/sake_maki/@SUBTYPES{@OLD} /datum/crafting_recipe/sushi_Ebi/@SUBTYPES : /datum/crafting_recipe/sushi_ebi/@SUBTYPES{@OLD} @@ -133,7 +133,7 @@ /datum/ErrorViewer/ErrorSource/@SUBTYPES : /datum/error_viewer/error_source/@SUBTYPES{@OLD} /datum/objective/revenantFluff/@SUBTYPES : /datum/objective/revenant_fluff/@SUBTYPES{@OLD} /datum/recipe/grill/sushi_Sake/@SUBTYPES : /datum/recipe/grill/sushi_sake/@SUBTYPES{@OLD} -/obj/item/food/sushi_TobikoEgg/@SUBTYPES : /obj/item/food/slice/sushi_tobiko_egg/@SUBTYPES{@OLD} +/obj/item/food/sushi_TobikoEgg/@SUBTYPES : /obj/item/food/sliced/sushi_tobiko_egg/@SUBTYPES{@OLD} /datum/ErrorViewer/ErrorCache/@SUBTYPES : /datum/error_viewer/error_cache/@SUBTYPES{@OLD} /datum/ErrorViewer/ErrorEntry/@SUBTYPES : /datum/error_viewer/error_entry/@SUBTYPES{@OLD} /datum/recipe/grill/sushi_Ebi/@SUBTYPES : /datum/recipe/grill/sushi_ebi/@SUBTYPES{@OLD} @@ -142,23 +142,23 @@ /area/ruin/unpowered/BMPship/@SUBTYPES : /area/ruin/unpowered/bmp_ship/@SUBTYPES{@OLD} /datum/dog_fashion/head/HoS/@SUBTYPES : /datum/dog_fashion/head/hos/@SUBTYPES{@OLD} /obj/item/clothing/head/HoS/@SUBTYPES : /obj/item/clothing/head/hos/@SUBTYPES{@OLD} -/obj/item/food/slice/sushi_masago/@SUBTYPES : /obj/item/food/slice/sushi_masago/@SUBTYPES{@OLD} -/obj/item/food/slice/sushi_tamago/@SUBTYPES : /obj/item/food/slice/sushi_tamago/@SUBTYPES{@OLD} -/obj/item/food/slice/sushi_tobiko/@SUBTYPES : /obj/item/food/slice/sushi_tobiko/@SUBTYPES{@OLD} +/obj/item/food/sliced/sushi_masago/@SUBTYPES : /obj/item/food/sliced/sushi_masago/@SUBTYPES{@OLD} +/obj/item/food/sliced/sushi_tamago/@SUBTYPES : /obj/item/food/sliced/sushi_tamago/@SUBTYPES{@OLD} +/obj/item/food/sliced/sushi_tobiko/@SUBTYPES : /obj/item/food/sliced/sushi_tobiko/@SUBTYPES{@OLD} /obj/item/stack/packageWrap/@SUBTYPES : /obj/item/stack/package_wrap/@SUBTYPES{@OLD} /datum/crafting_recipe/IED/@SUBTYPES : /datum/crafting_recipe/ied/@SUBTYPES{@OLD} /datum/middleClickOverride/@SUBTYPES : /datum/middle_click_override/@SUBTYPES{@OLD} /obj/item/food/sushi_Ikura/@SUBTYPES : /obj/item/food/sushi_ikura/@SUBTYPES{@OLD} -/obj/item/food/slice/sushi_inari/@SUBTYPES : /obj/item/food/slice/sushi_inari/@SUBTYPES{@OLD} +/obj/item/food/sliced/sushi_inari/@SUBTYPES : /obj/item/food/sliced/sushi_inari/@SUBTYPES{@OLD} /obj/item/food/sushi_Unagi/@SUBTYPES : /obj/item/food/sushi_unagi/@SUBTYPES{@OLD} /obj/item/storage/box/PDAs/@SUBTYPES : /obj/item/storage/box/pdas/@SUBTYPES{@OLD} /obj/structure/bigDelivery/@SUBTYPES : /obj/structure/big_delivery/@SUBTYPES{@OLD} /datum/mapGeneratorModule/@SUBTYPES : /datum/map_generator_module/@SUBTYPES{@OLD} -/obj/item/food/slice/sushi_sake/@SUBTYPES : /obj/item/food/slice/sushi_sake/@SUBTYPES{@OLD} +/obj/item/food/sliced/sushi_sake/@SUBTYPES : /obj/item/food/sliced/sushi_sake/@SUBTYPES{@OLD} /obj/item/shippingPackage/@SUBTYPES : /obj/item/shipping_package/@SUBTYPES{@OLD} /obj/item/aiModule/toyAI/@SUBTYPES : /obj/item/aiModule/toy_ai/@SUBTYPES{@OLD} /obj/item/food/sushi_Ebi/@SUBTYPES : /obj/item/food/sushi_ebi/@SUBTYPES{@OLD} -/obj/item/food/slice/sushi_tai/@SUBTYPES : /obj/item/food/slice/sushi_tai/@SUBTYPES{@OLD} +/obj/item/food/sliced/sushi_tai/@SUBTYPES : /obj/item/food/sliced/sushi_tai/@SUBTYPES{@OLD} /obj/item/smallDelivery/@SUBTYPES : /obj/item/small_delivery/@SUBTYPES{@OLD} /datum/design/BS_RPED/@SUBTYPES : /datum/design/bs_rped/@SUBTYPES{@OLD} /obj/item/paper/Court/@SUBTYPES : /obj/item/paper/court/@SUBTYPES{@OLD} diff --git a/tools/pr_sql/27268/snake_case_type_remap.json b/tools/pr_sql/27268/snake_case_type_remap.json index bda5874c3dc6..06cd99e97e23 100644 --- a/tools/pr_sql/27268/snake_case_type_remap.json +++ b/tools/pr_sql/27268/snake_case_type_remap.json @@ -622,36 +622,36 @@ "replace": "/obj/item/food/sushi_ikura" }, { - "original": "/obj/item/food/slice/sushi_inari", - "replace": "/obj/item/food/slice/sushi_inari" + "original": "/obj/item/food/sliced/sushi_inari", + "replace": "/obj/item/food/sliced/sushi_inari" }, { - "original": "/obj/item/food/slice/sushi_masago", - "replace": "/obj/item/food/slice/sushi_masago" + "original": "/obj/item/food/sliced/sushi_masago", + "replace": "/obj/item/food/sliced/sushi_masago" }, { - "original": "/obj/item/food/slice/sushi_sake", - "replace": "/obj/item/food/slice/sushi_sake" + "original": "/obj/item/food/sliced/sushi_sake", + "replace": "/obj/item/food/sliced/sushi_sake" }, { "original": "/obj/item/food/sushi_SmokedSalmon", - "replace": "/obj/item/food/slice/sushi_smoked_salmon" + "replace": "/obj/item/food/sliced/sushi_smoked_salmon" }, { - "original": "/obj/item/food/slice/sushi_tai", - "replace": "/obj/item/food/slice/sushi_tai" + "original": "/obj/item/food/sliced/sushi_tai", + "replace": "/obj/item/food/sliced/sushi_tai" }, { - "original": "/obj/item/food/slice/sushi_tamago", - "replace": "/obj/item/food/slice/sushi_tamago" + "original": "/obj/item/food/sliced/sushi_tamago", + "replace": "/obj/item/food/sliced/sushi_tamago" }, { - "original": "/obj/item/food/slice/sushi_tobiko", - "replace": "/obj/item/food/slice/sushi_tobiko" + "original": "/obj/item/food/sliced/sushi_tobiko", + "replace": "/obj/item/food/sliced/sushi_tobiko" }, { "original": "/obj/item/food/sushi_TobikoEgg", - "replace": "/obj/item/food/slice/sushi_tobiko_egg" + "replace": "/obj/item/food/sliced/sushi_tobiko_egg" }, { "original": "/obj/item/food/sushi_Unagi", From 18ae6d9233dcdb8479c7e42eaa3903c4a675bd19 Mon Sep 17 00:00:00 2001 From: Drsmail Date: Fri, 3 Jan 2025 04:48:43 +0300 Subject: [PATCH 3/8] Small fix --- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 4 ++-- .../traitor/contractor/datums/syndicate_contract.dm | 2 +- code/modules/food_and_drinks/food_base.dm | 9 +++++++++ 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index 878309c164fb..a31a5d9d7580 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -144,13 +144,13 @@ /area/ruin/powered/pizza_party) "D" = ( /obj/structure/table/wood, -obj/item/food/sliced/margherita_pizza, +/obj/item/food/sliced/margherita_pizza, /obj/item/trash/plate, /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "E" = ( /obj/structure/table/wood, -obj/item/food/sliced/meat_pizza, +/obj/item/food/sliced/meat_pizza, /turf/simulated/floor/wood/lavaland_air, /area/ruin/powered/pizza_party) "F" = ( diff --git a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm index 03b689205bb1..3ffe992d1cb4 100644 --- a/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm +++ b/code/modules/antagonists/traitor/contractor/datums/syndicate_contract.dm @@ -423,7 +423,7 @@ M.update_icons() // Supply them with some chow. How generous is the Syndicate? - var/obj/item/food/sliced/bread/food = new(get_turf(M)) + var/obj/item/food/sliced/bread/food = new(get_turf(M)) // TODO 545 food.name = "stale bread" food.desc = "Looks like your captors care for their prisoners as much as their bread." food.trash = null diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index d53a526a2d26..7a7e9295281f 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -280,6 +280,15 @@ var/test = 3 /obj/item/food/sliced/Initialize(mapload, parent_reagents) + if(!parent_reagents && !length(list_reagents)) + //log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") + CRASH("Slice was created with no reagents! [src]") // 68, 181, 2 + list_reagents = parent_reagents + return ..() + +/obj/item/food/sliced/New(parent_reagents) + . = ..() + if(!parent_reagents && !list_reagents) //log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") CRASH("Slice was created with no reagents! [src]") From 2082a4c6058876541f5ff33d4347aeb2dd48e509 Mon Sep 17 00:00:00 2001 From: Drsmail Date: Fri, 3 Jan 2025 05:25:33 +0300 Subject: [PATCH 4/8] Adds default reagent for empy slices --- code/modules/food_and_drinks/food_base.dm | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index 7a7e9295281f..6f56ae0ecadd 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -277,24 +277,15 @@ //MARK: SLICE /obj/item/food/sliced - var/test = 3 /obj/item/food/sliced/Initialize(mapload, parent_reagents) if(!parent_reagents && !length(list_reagents)) //log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") + reagents.add_reagent("nutriment", 5) CRASH("Slice was created with no reagents! [src]") // 68, 181, 2 list_reagents = parent_reagents return ..() -/obj/item/food/sliced/New(parent_reagents) - . = ..() - - if(!parent_reagents && !list_reagents) - //log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") - CRASH("Slice was created with no reagents! [src]") - list_reagents = parent_reagents - return ..() - //MARK: SLICEABLE /obj/item/food/sliceable slices_num = 2 @@ -361,7 +352,7 @@ slices_lost = rand(1, min(1, round(slices_num / 2))) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i in 1 to (slices_num - slices_lost)) - if(!istype(slice_path, /obj/item/food/sliced)) + if(!ispath(slice_path, /obj/item/food/sliced)) CRASH("Invalid type assigned to slice_path: [slice_path]") var/obj/item/food/sliced/slice = new slice_path (loc,reagents_per_slice) slice.pixel_x = rand(-7, 7) From 2dedaa1ef715664cacf712a239ee8d8a32f44f0c Mon Sep 17 00:00:00 2001 From: Drsmail Date: Fri, 3 Jan 2025 05:43:22 +0300 Subject: [PATCH 5/8] Looks good --- code/modules/food_and_drinks/food_base.dm | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/code/modules/food_and_drinks/food_base.dm b/code/modules/food_and_drinks/food_base.dm index 6f56ae0ecadd..5d1a6bbbd809 100644 --- a/code/modules/food_and_drinks/food_base.dm +++ b/code/modules/food_and_drinks/food_base.dm @@ -278,12 +278,15 @@ //MARK: SLICE /obj/item/food/sliced -/obj/item/food/sliced/Initialize(mapload, parent_reagents) - if(!parent_reagents && !length(list_reagents)) - //log_debug("Slice was created with no parent! Name: [src], UID:[src.UID()], loc:[src.loc]") - reagents.add_reagent("nutriment", 5) - CRASH("Slice was created with no reagents! [src]") // 68, 181, 2 - list_reagents = parent_reagents +/obj/item/food/sliced/Initialize(mapload, made_by_sliceable = FALSE) + if(made_by_sliceable) + return ..() + if(length(list_reagents)) + return ..() + + // We don't have any reagents, let's add someting + list_reagents = list("nutriment" = 5) + return ..() //MARK: SLICEABLE @@ -291,7 +294,7 @@ slices_num = 2 /obj/item/food/sliceable/Initialize(mapload) - if(!istype(slice_path, /obj/item/food/sliced)) + if(!ispath(slice_path, /obj/item/food/sliced)) CRASH("Invalid type assigned to slice_path: [slice_path]") return ..() @@ -352,9 +355,8 @@ slices_lost = rand(1, min(1, round(slices_num / 2))) var/reagents_per_slice = reagents.total_volume/slices_num for(var/i in 1 to (slices_num - slices_lost)) - if(!ispath(slice_path, /obj/item/food/sliced)) - CRASH("Invalid type assigned to slice_path: [slice_path]") - var/obj/item/food/sliced/slice = new slice_path (loc,reagents_per_slice) + var/obj/slice = new slice_path (loc, TRUE) + reagents.trans_to(slice,reagents_per_slice) slice.pixel_x = rand(-7, 7) slice.pixel_y = rand(-7, 7) qdel(src) From 9fb71c769a2c1ca4ebaa28b100f0d5ad9f4957df Mon Sep 17 00:00:00 2001 From: Drsmail Date: Fri, 3 Jan 2025 19:34:52 +0300 Subject: [PATCH 6/8] adds_list_reagents --- .../food_and_drinks/food/foods/baked_goods.dm | 39 ++++++++++++++++--- .../food_and_drinks/food/foods/bread.dm | 10 ++++- .../food_and_drinks/food/foods/ingredients.dm | 21 ++++++---- .../food_and_drinks/food/foods/meat.dm | 3 +- .../food_and_drinks/food/foods/pizza.dm | 36 +++++++++++------ 5 files changed, 82 insertions(+), 27 deletions(-) diff --git a/code/modules/food_and_drinks/food/foods/baked_goods.dm b/code/modules/food_and_drinks/food/foods/baked_goods.dm index 3bdcaf02d663..d9c3857e654e 100644 --- a/code/modules/food_and_drinks/food/foods/baked_goods.dm +++ b/code/modules/food_and_drinks/food/foods/baked_goods.dm @@ -25,6 +25,7 @@ icon_state = "carrotcake_slice" trash = /obj/item/trash/plate filling_color = "#FFD675" + list_reagents = list("nutriment" = 4, "oculine" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "carrot" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -49,6 +50,7 @@ icon_state = "braincakeslice" trash = /obj/item/trash/plate filling_color = "#E6AEDB" + list_reagents = list("protein" = 2, "nutriment" = 2, "mannitol" = 2, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "brains" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -72,6 +74,7 @@ icon_state = "cheesecake_slice" trash = /obj/item/trash/plate filling_color = "#FAF7AF" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 4, "cream cheese" = 3) goal_difficulty = FOOD_GOAL_EASY @@ -95,6 +98,7 @@ icon_state = "plaincake_slice" trash = /obj/item/trash/plate filling_color = "#F7EDD5" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "vanilla" = 1, "sweetness" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -118,6 +122,7 @@ icon_state = "orangecake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "oranges" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -141,6 +146,7 @@ icon_state = "bananacake_slice" trash = /obj/item/trash/plate filling_color = "#FADA8E" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "banana" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -164,6 +170,7 @@ icon_state = "limecake_slice" trash = /obj/item/trash/plate filling_color = "#CBFA8E" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "unbearable sourness" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -187,6 +194,7 @@ icon_state = "lemoncake_slice" trash = /obj/item/trash/plate filling_color = "#FAFA8E" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 2, "sourness" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -210,6 +218,7 @@ icon_state = "chocolatecake_slice" trash = /obj/item/trash/plate filling_color = "#805930" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 1, "chocolate" = 4) goal_difficulty = FOOD_GOAL_EASY @@ -233,6 +242,7 @@ icon_state = "birthdaycakeslice" trash = /obj/item/trash/plate filling_color = "#FFD6D6" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -256,6 +266,7 @@ icon_state = "applecakeslice" trash = /obj/item/trash/plate filling_color = "#EBF5B8" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("cake" = 5, "sweetness" = 1, "apple" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -268,7 +279,7 @@ slices_num = 5 bitesize = 3 filling_color = "#ffffff" - list_reagents = list("nutriment" = 1, "vitamin" = 3, "holywater" = 10) + list_reagents = list("nutriment" = 5, "vitamin" = 5, "holywater" = 10) tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -279,6 +290,7 @@ icon_state = "holy_cake_slice" trash = /obj/item/trash/plate filling_color = "#ffffff" + list_reagents = list("nutriment" = 1, "vitamin" = 1, "holywater" = 2) tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -303,6 +315,7 @@ icon_state = "liars_slice" trash = /obj/item/trash/plate filling_color = "#ffffff" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "cocoa" = 1) tastes = list("strawberries" = 2, "chocolate" = 2, "sweetness" = 2, "cake" = 3) goal_difficulty = FOOD_GOAL_EASY @@ -326,6 +339,7 @@ icon_state = "vanilla_berry_cake_slice" trash = /obj/item/trash/plate filling_color = "#ffffff" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "vanilla" = 1) tastes = list("blackberry" = 2, "strawberries" = 2, "vanilla" = 2, "sweetness" = 2, "cake" = 3) goal_difficulty = FOOD_GOAL_EASY @@ -349,6 +363,7 @@ icon_state = "hardware_cake_slice" trash = /obj/item/trash/plate filling_color = "#4ac25e" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "sacid" = 3, "oil" = 3) tastes = list("acid" = 3, "metal" = 4, "glass" = 5) goal_difficulty = FOOD_GOAL_EASY @@ -372,6 +387,7 @@ icon_state = "plum_cake_slice" trash = /obj/item/trash/plate filling_color = "#a128c5" + list_reagents = list("nutriment" = 4, "vitamin" = 2) tastes = list("cake" = 5, "sweetness" = 1, "plum" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -395,6 +411,7 @@ icon_state = "pound_cake_slice" trash = /obj/item/trash/plate filling_color = "#ffffff" + list_reagents = list("nutriment" = 12, "vitamin" = 4) tastes = list("cake" = 5, "sweetness" = 5, "batter" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -418,6 +435,7 @@ icon_state = "pumpkin_spice_cake_slice" trash = /obj/item/trash/plate filling_color = "#ee710a" + list_reagents = list("nutriment" = 4, "vitamin" = 2) tastes = list("cake" = 5, "sweetness" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -441,6 +459,7 @@ icon_state = "slime_cake_slice" trash = /obj/item/trash/plate filling_color = "#0adfee" + list_reagents = list("nutriment" = 4, "vitamin" = 2) tastes = list("cake" = 5, "sweetness" = 1, "slime" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -464,6 +483,7 @@ icon_state = "trumpet_cake_slice" trash = /obj/item/trash/plate filling_color = "#610977" + list_reagents = list("nutriment" = 4, "vitamin" = 2, "cream" = 1, "berryjuice" = 1) tastes = list("cake" = 4, "violets" = 2, "jam" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -486,6 +506,7 @@ icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "vanilla_cake_slice" filling_color = "#ece7ee" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "sugar" = 3, "vanilla" = 3) tastes = list("cake" = 1, "sugar" = 1, "vanilla" = 10) goal_difficulty = FOOD_GOAL_EASY @@ -494,11 +515,11 @@ desc = "A light and fluffy vegan marshmallow flavoured with vanilla and rum and topped with soft chocolate. These are known to the moths as höllflöfstarkken: cloud squares." //höllflöf = cloud (höll = wind, flöf = cotton), starkken = squares icon = 'icons/obj/food/bakedgoods.dmi' icon_state = "mothmallow_tray" - list_reagents = list("nutriment" = 20, "sugar" = 20) slice_path = /obj/item/food/sliced/mothmallow slices_num = 5 bitesize = 3 filling_color = "#eebe98" + list_reagents = list("nutriment" = 20, "sugar" = 20) tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -509,6 +530,7 @@ icon_state = "mothmallow_slice" filling_color = "#ece7ee" filling_color = "#eebe98" + list_reagents = list("nutriment" = 4, "sugar" = 4) tastes = list("vanilla" = 1, "clouds" = 1, "chocolate" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -705,6 +727,7 @@ icon_state = "pumpkinpieslice" trash = /obj/item/trash/plate filling_color = "#F5B951" + list_reagents = list("nutriment" = 4, "vitamin" = 1) tastes = list("pie" = 1, "pumpkin" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -727,7 +750,7 @@ slices_num = 5 bitesize = 3 filling_color = "#102d8b" - list_reagents = list("nutriment" = 13, "vitamin" = 6, "blumpkinjuice" = 5) + list_reagents = list("nutriment" = 20, "vitamin" = 5, "blumpkinjuice" = 5) tastes = list("pie" = 1, "a mouthful of pool water" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -738,6 +761,7 @@ icon_state = "blumpkin_pie_slice" trash = /obj/item/trash/plate filling_color = "#102d8b" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "blumpkinjuice" = 1) tastes = list("pie" = 1, "a mouthful of pool water" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -750,7 +774,7 @@ slices_num = 5 bitesize = 3 filling_color = "#5e4337" - list_reagents = list("nutriment" = 12, "vitamin" = 4) + list_reagents = list("nutriment" = 15, "vitamin" = 5) tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -761,6 +785,7 @@ icon_state = "french_silk_pie_slice" trash = /obj/item/trash/plate filling_color = "#5e4337" + list_reagents = list("nutriment" = 3, "vitamin" = 1) tastes = list("pie" = 1, "smooth chocolate" = 1, "whipped cream" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -773,7 +798,7 @@ slices_num = 5 bitesize = 3 filling_color = "#5e4337" - list_reagents = list("nutriment" = 14, "vitamin" = 6) + list_reagents = list("nutriment" = 15, "vitamin" = 5) tastes = list("mint" = 1, "pie" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -784,6 +809,7 @@ icon_state = "frosty_pie_slice" trash = /obj/item/trash/plate filling_color = "#338cb6" + list_reagents = list("nutriment" = 3, "vitamin" = 1) tastes = list("mint" = 1, "pie" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -1329,7 +1355,7 @@ slices_num = 5 bitesize = 3 filling_color = "#411b02" - list_reagents = list("nutriment" = 14, "vitamin" = 8) + list_reagents = list("nutriment" = 15, "vitamin" = 10) tastes = list("jelly" = 1, "sweet potato" = 1) goal_difficulty = FOOD_GOAL_NORMAL @@ -1340,6 +1366,7 @@ icon_state = "dulce_de_batata_slice" trash = /obj/item/trash/plate filling_color = "#411b02" + list_reagents = list("nutriment" = 3, "vitamin" = 2) tastes = list("jelly" = 1, "sweet potato" = 1) goal_difficulty = FOOD_GOAL_NORMAL diff --git a/code/modules/food_and_drinks/food/foods/bread.dm b/code/modules/food_and_drinks/food/foods/bread.dm index 8d95c41ba93d..c18ab05c686f 100644 --- a/code/modules/food_and_drinks/food/foods/bread.dm +++ b/code/modules/food_and_drinks/food/foods/bread.dm @@ -21,6 +21,8 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "meatbreadslice" filling_color = "#FF7575" + list_reagents = list("protein" = 4, "nutriment" = 2, "vitamin" = 1) + tastes = list("bread" = 10, "meat" = 10) goal_difficulty = FOOD_GOAL_EASY /obj/item/food/sliceable/xenomeatbread @@ -41,6 +43,8 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "xenobreadslice" filling_color = "#8AFF75" + list_reagents = list("protein" = 4, "nutriment" = 2, "vitamin" = 1) + tastes = list("bread" = 10, "acid" = 10) goal_difficulty = FOOD_GOAL_EXCESSIVE /obj/item/food/sliceable/spidermeatbread @@ -59,6 +63,7 @@ desc = "A slice of meatloaf made from an animal that most likely still wants you dead." icon = 'icons/obj/food/burgerbread.dmi' icon_state = "spidermeatslice" + list_reagents = list("protein" = 4, "nutriment" = 2, "toxin" = 3, "vitamin" = 1) tastes = list("bread" = 10, "cobwebs" = 5) list_reagents = list("toxin" = 2) goal_difficulty = FOOD_GOAL_EXCESSIVE @@ -81,6 +86,7 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "bananabreadslice" filling_color = "#EDE5AD" + list_reagents = list("banana" = 4, "nutriment" = 4) tastes = list("bread" = 10, "banana" = 5) goal_difficulty = FOOD_GOAL_EASY @@ -102,6 +108,8 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "tofubreadslice" filling_color = "#F7FFE0" + list_reagents = list("nutriment" = 4, "vitamin" = 1) + tastes = list("bread" = 10, "tofu" = 10) goal_difficulty = FOOD_GOAL_EASY /obj/item/food/sliceable/bread @@ -122,7 +130,7 @@ icon = 'icons/obj/food/burgerbread.dmi' icon_state = "breadslice" filling_color = "#D27332" - list_reagents = list("nutriment" = 2, "bread" = 5) + list_reagents = list("nutriment" = 2, "bread" = 5) // TODO Why bread? tastes = list("bread" = 1) goal_difficulty = FOOD_GOAL_EASY diff --git a/code/modules/food_and_drinks/food/foods/ingredients.dm b/code/modules/food_and_drinks/food/foods/ingredients.dm index ee45dd385fc9..3edb1bf96773 100644 --- a/code/modules/food_and_drinks/food/foods/ingredients.dm +++ b/code/modules/food_and_drinks/food/foods/ingredients.dm @@ -44,7 +44,7 @@ slice_path = /obj/item/food/sliced/cheesewedge slices_num = 5 filling_color = "#FFF700" - list_reagents = list("nutriment" = 15, "vitamin" = 5, "cheese" = 20) + list_reagents = list("nutriment" = 16, "vitamin" = 4, "cheese" = 20) tastes = list("cheese" = 1) /obj/item/food/sliced/cheesewedge @@ -52,6 +52,7 @@ desc = "A wedge of delicious Cheddar. The cheese wheel it was cut from can't have gone far." icon_state = "cheesewedge" filling_color = "#FFF700" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "cheese" = 5) tastes = list("cheese" = 1) /obj/item/food/sliceable/cheesewheel/smoked @@ -60,13 +61,14 @@ icon_state = "cheesewheel-smoked" slice_path = /obj/item/food/sliced/cheesewedge/smoked slices_num = 4 - list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15) + list_reagents = list("nutriment" = 16, "vitamin" = 4, "cheese" = 20) tastes = list("cheese" = 1, "smoke" = 2) /obj/item/food/sliced/cheesewedge/smoked name = "smoked cheese wedge" desc = "A wedge of fancy smoked cheese." icon_state = "cheesewedge-smoked" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "cheese" = 5) tastes = list("cheese" = 1, "smoke" = 2) /obj/item/food/sliceable/cheesewheel/edam @@ -75,13 +77,14 @@ icon_state = "cheesewheel-edam" slice_path = /obj/item/food/sliced/cheesewedge/edam slices_num = 4 - list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 15) + list_reagents = list("nutriment" = 16, "vitamin" = 4, "cheese" = 20) tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2) /obj/item/food/sliced/cheesewedge/edam name = "edam cheese wedge" desc = "A wedge of mild edam cheese. It's said to have a nutty flavor." icon_state = "cheesewedge-edam" + list_reagents = list("nutriment" = 4, "vitamin" = 1, "cheese" = 5) tastes = list("cheese" = 1, "salt" = 2, "almonds" = 2) /obj/item/food/sliceable/cheesewheel/blue @@ -89,8 +92,8 @@ desc = "A wheel of pungent blue cheese. It's an acquired taste..." icon_state = "cheesewheel-blue" slice_path = /obj/item/food/sliced/cheesewedge/blue - slices_num = 5 - list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 10) + slices_num = 4 + list_reagents = list("nutriment" = 4, "vitamin" = 4, "cheese" = 12) tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1) /obj/item/food/sliced/cheesewedge/blue @@ -98,6 +101,7 @@ desc = "A wedge of pungent blue cheese. The flavor is... intense." icon_state = "cheesewedge-blue" bitesize = 2 + list_reagents = list("nutriment" = 1, "vitamin" = 1, "cheese" = 3) tastes = list("strong cheese" = 2, "salt" = 1, "bitter mold" = 1) /obj/item/food/sliceable/cheesewheel/camembert @@ -106,7 +110,7 @@ icon_state = "cheesewheel-camembert" slice_path = /obj/item/food/sliced/cheesewedge/camembert slices_num = 2 - list_reagents = list("nutriment" = 1, "vitamin" = 2, "cheese" = 6) + list_reagents = list("nutriment" = 4, "vitamin" = 4, "cheese" = 8) tastes = list("mild cheese" = 3, "gooeyness" = 1) /obj/item/food/sliced/cheesewedge/camembert @@ -114,6 +118,7 @@ desc = "A piece of camembert. It's soft and gooey." icon_state = "cheesewedge-camembert" bitesize = 2 + list_reagents = list("nutriment" = 2, "vitamin" = 2, "cheese" = 4) tastes = list("mild cheese" = 3, "gooeyness" = 1) /obj/item/food/sliced/cheesewedge/checkpass(passflag) @@ -156,6 +161,7 @@ desc = "A slice of watery goodness." icon_state = "watermelonslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#FF3867" + list_reagents = list("plantmatter" = 1) tastes = list("watermelon" = 1) /obj/item/food/sliced/tomato @@ -171,6 +177,7 @@ desc = "Rings of pineapple." icon_state = "pineappleslice" // Sprite created by https://github.com/binarysudoku for Goonstation, They have relicensed it for our use. filling_color = "#e5b437" + list_reagents = list("plantmatter" = 1, "vitamin" = 1) tastes = list("pineapple" = 1) @@ -215,7 +222,7 @@ desc = "The building block of an impressive dish." icon = 'icons/obj/food/food_ingredients.dmi' icon_state = "doughslice" - list_reagents = list("nutriment" = 1) + list_reagents = list("nutriment" = 2) tastes = list("dough" = 1) diff --git a/code/modules/food_and_drinks/food/foods/meat.dm b/code/modules/food_and_drinks/food/foods/meat.dm index 135cea76fdb7..9c0f7b8a94b1 100644 --- a/code/modules/food_and_drinks/food/foods/meat.dm +++ b/code/modules/food_and_drinks/food/foods/meat.dm @@ -566,7 +566,7 @@ icon_state = "turkey" slice_path = /obj/item/food/sliced/turkey slices_num = 6 - list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 5) + list_reagents = list("protein" = 24, "nutriment" = 18, "vitamin" = 6) tastes = list("turkey" = 2, "stuffing" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -577,6 +577,7 @@ icon_state = "turkeyslice" trash = /obj/item/trash/plate filling_color = "#B97A57" + list_reagents = list("protein" = 4, "nutriment" = 3, "vitamin" = 1) tastes = list("turkey" = 1) goal_difficulty = FOOD_GOAL_EASY diff --git a/code/modules/food_and_drinks/food/foods/pizza.dm b/code/modules/food_and_drinks/food/foods/pizza.dm index df684cccf4a0..15493a947b07 100644 --- a/code/modules/food_and_drinks/food/foods/pizza.dm +++ b/code/modules/food_and_drinks/food/foods/pizza.dm @@ -15,7 +15,7 @@ desc = "The golden standard of pizzas." icon_state = "margheritapizza" slice_path = /obj/item/food/sliced/margherita_pizza - list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5) + list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 6) goal_difficulty = FOOD_GOAL_DUPLICATE /obj/item/food/sliced/margherita_pizza @@ -24,6 +24,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "margheritapizzaslice" filling_color = "#BAA14C" + list_reagents = list("nutriment" = 5, "tomatojuice" = 1, "vitamin" = 1) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -33,7 +34,7 @@ desc = "A pizza with meat topping." icon_state = "meatpizza" slice_path = /obj/item/food/sliced/meat_pizza - list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) + list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 6) tastes = list("crust" = 1, "cheese" = 1, "meat" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -43,6 +44,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "meatpizzaslice" filling_color = "#BAA14C" + list_reagents = list("protein" = 5, "tomatojuice" = 1, "vitamin" = 1) tastes = list("crust" = 1, "cheese" = 1, "meat" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -52,7 +54,7 @@ desc = "Very special pizza." icon_state = "mushroompizza" slice_path = /obj/item/food/sliced/mushroom_pizza - list_reagents = list("plantmatter" = 30, "vitamin" = 5) + list_reagents = list("plantmatter" = 30, "vitamin" = 6) tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -62,6 +64,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "mushroompizzaslice" filling_color = "#BAA14C" + list_reagents = list("plantmatter" = 5, "vitamin" = 1) tastes = list("crust" = 1, "cheese" = 1, "mushroom" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -71,7 +74,7 @@ desc = "No Tomato Sapiens were harmed during the making of this pizza." icon_state = "vegetablepizza" slice_path = /obj/item/food/sliced/vegetable_pizza - list_reagents = list("plantmatter" = 25, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 5) + list_reagents = list("plantmatter" = 24, "tomatojuice" = 6, "oculine" = 12, "vitamin" = 6) tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -81,6 +84,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "vegetablepizzaslice" filling_color = "#BAA14C" + list_reagents = list("plantmatter" = 4, "tomatojuice" = 1, "oculine" = 2, "vitamin" = 1) tastes = list("crust" = 1, "tomato" = 1, "carrot" = 1, "vegetables" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -90,7 +94,7 @@ desc = "Love it or hate it, this pizza divides opinions. Complete with juicy pineapple." icon_state = "hawaiianpizza" slice_path = /obj/item/food/sliced/hawaiian_pizza - list_reagents = list("protein" = 15, "tomatojuice" = 6, "plantmatter" = 20, "pineapplejuice" = 6, "vitamin" = 5) + list_reagents = list("protein" = 18, "tomatojuice" = 6, "plantmatter" = 24, "pineapplejuice" = 6, "vitamin" = 6) tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -100,6 +104,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "hawaiianpizzaslice" filling_color = "#e5b437" + list_reagents = list("protein" = 3, "tomatojuice" = 1, "plantmatter" = 4, "pineapplejuice" = 1, "vitamin" = 1) tastes = list("crust" = 1, "cheese" = 1, "pineapple" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -109,8 +114,8 @@ desc = "Gastronomists have yet to classify this dish as 'pizza'." icon_state = "macpizza" slice_path = /obj/item/food/sliced/mac_pizza - list_reagents = list("nutriment" = 40, "vitamin" = 5) //More nutriment because carbs, but it's not any more vitaminicious filling_color = "#ffe45d" + list_reagents = list("nutriment" = 42, "vitamin" = 6) //More nutriment because carbs, but it's not any more vitaminicious tastes = list("crust" = 1, "cheese" = 2, "pasta" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -120,6 +125,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "macpizzaslice" filling_color = "#ffe45d" + list_reagents = list("nutriment" = 7, "vitamin" = 1) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 2, "pasta" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -129,7 +135,7 @@ desc = "What did the pepperoni say to the pizza?" icon_state = "pepperonipizza" slice_path = /obj/item/food/sliced/pepperoni_pizza - list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 8) + list_reagents = list("protein" = 30, "tomatojuice" = 6, "vitamin" = 9) filling_color = "#ffe45d" tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -140,6 +146,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "pepperonipizzaslice" filling_color = "#ffe45d" + list_reagents = list("protein" = 5, "tomatojuice" = 1, "vitamin" = 1.5) tastes = list("cheese" = 3, "pepperoni" = 3, "grease" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -149,7 +156,7 @@ desc = "Cheese, bread, cheese, tomato, and cheese." icon_state = "cheesepizza" slice_path = /obj/item/food/sliced/cheese_pizza - list_reagents = list("nutriment" = 40, "tomatojuice" = 6, "vitamin" = 5) + list_reagents = list("nutriment" = 42, "tomatojuice" = 6, "vitamin" = 6) goal_difficulty = FOOD_GOAL_DUPLICATE /obj/item/food/sliced/cheese_pizza @@ -158,6 +165,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "cheesepizzaslice" filling_color = "#BAA14C" + list_reagents = list("nutriment" = 7, "tomatojuice" = 1, "vitamin" = 1) tastes = list("crust" = 1, "tomato" = 1, "cheese" = 3) goal_difficulty = FOOD_GOAL_EASY @@ -167,7 +175,7 @@ desc = "Who thought this would be a good idea?" icon_state = "donkpocketpizza" slice_path = /obj/item/food/sliced/donk_pocket_pizza - list_reagents = list("nutriment" = 35, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6) + list_reagents = list("nutriment" = 36, "tomatojuice" = 6, "vitamin" = 2, "weak_omnizine" = 6) tastes = list("crust" = 1, "meat" = 1, "laziness" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -177,6 +185,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "donkpocketpizzaslice" filling_color = "#BAA14C" + list_reagents = list("nutriment" = 6, "tomatojuice" = 1, "vitamin" = 2/6, "weak_omnizine" = 1) tastes = list("crust" = 1, "meat" = 1, "laziness" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -186,7 +195,7 @@ desc = "The hippie's pizza of choice." icon_state = "dankpizza" slice_path = /obj/item/food/sliced/dank_pizza - list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 5, "cbd" = 6, "thc" = 6) + list_reagents = list("nutriment" = 30, "tomatojuice" = 6, "vitamin" = 6, "cbd" = 6, "thc" = 6) tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -196,6 +205,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "dankpizzaslice" filling_color = "#BAA14C" + list_reagents = list("nutriment" = 5, "tomatojuice" = 1, "vitamin" = 1, "cbd" = 1, "thc" = 1) tastes = list("crust" = 1, "cheese" = 1, "special herbs" = 2) goal_difficulty = FOOD_GOAL_EASY @@ -205,7 +215,7 @@ desc = "Tastes HOT HOT HOT!" icon_state = "firecrackerpizza" slice_path = /obj/item/food/sliced/fire_cracker_pizza - list_reagents = list("nutriment" = 30, "vitamin" = 5, "capsaicin" = 12) + list_reagents = list("nutriment" = 30, "vitamin" = 6, "capsaicin" = 12) tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -215,6 +225,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "firecrackerpizzaslice" filling_color = "#BAA14C" + list_reagents = list("nutriment" = 5, "vitamin" = 1, "capsaicin" = 2) tastes = list("crust" = 1, "cheese" = 1, "HOTNESS" = 1) goal_difficulty = FOOD_GOAL_EASY @@ -224,7 +235,7 @@ desc = "Wait a second...this doesn't taste like pesto!" icon_state = "pestopizza" slice_path = /obj/item/food/sliced/pesto_pizza - list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 5, "wasabi" = 12) + list_reagents = list("nutriment" = 30, "tomatojuice" = 12, "vitamin" = 6, "wasabi" = 12) tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1) goal_difficulty = FOOD_GOAL_DUPLICATE @@ -234,6 +245,7 @@ icon = 'icons/obj/food/pizza.dmi' icon_state = "pestopizzaslice" filling_color = "#BAA14C" + list_reagents = list("nutriment" = 5, "tomatojuice" = 2, "vitamin" = 1, "wasabi" = 2) tastes = list("tomato" = 1, "cheese" = 1, "wasabi" = 1) goal_difficulty = FOOD_GOAL_EASY From 27a72bb925b2afd329bcd0be9888ea2df3067b19 Mon Sep 17 00:00:00 2001 From: Drsmail Date: Thu, 9 Jan 2025 03:30:37 +0300 Subject: [PATCH 7/8] "Reverted snake_case_remap files to state from original commit --- .../Scripts/27268_snake_case_remap.txt | 16 +- tools/pr_sql/27268/snake_case_type_remap.json | 694 ++++-------------- 2 files changed, 147 insertions(+), 563 deletions(-) diff --git a/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt b/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt index 48037f390409..87ee4c8e2af7 100644 --- a/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt +++ b/tools/UpdatePaths/Scripts/27268_snake_case_remap.txt @@ -115,7 +115,7 @@ /obj/item/aiModule/protectStation/@SUBTYPES : /obj/item/ai_module/protect_station/@SUBTYPES{@OLD} /obj/item/food/sliceable/Ebi_maki/@SUBTYPES : /obj/item/food/sliceable/ebi_maki/@SUBTYPES{@OLD} /obj/item/food/sliceable/Tai_maki/@SUBTYPES : /obj/item/food/sliceable/tai_maki/@SUBTYPES{@OLD} -/obj/item/food/sushi_SmokedSalmon/@SUBTYPES : /obj/item/food/sliced/sushi_smoked_salmon/@SUBTYPES{@OLD} +/obj/item/food/sushi_SmokedSalmon/@SUBTYPES : /obj/item/food/sushi_smoked_salmon/@SUBTYPES{@OLD} /area/ruin/unpowered/BMPship/Aft/@SUBTYPES : /area/ruin/unpowered/bmp_ship/aft/@SUBTYPES{@OLD} /datum/crafting_recipe/Sake_maki/@SUBTYPES : /datum/crafting_recipe/sake_maki/@SUBTYPES{@OLD} /datum/crafting_recipe/sushi_Ebi/@SUBTYPES : /datum/crafting_recipe/sushi_ebi/@SUBTYPES{@OLD} @@ -133,7 +133,7 @@ /datum/ErrorViewer/ErrorSource/@SUBTYPES : /datum/error_viewer/error_source/@SUBTYPES{@OLD} /datum/objective/revenantFluff/@SUBTYPES : /datum/objective/revenant_fluff/@SUBTYPES{@OLD} /datum/recipe/grill/sushi_Sake/@SUBTYPES : /datum/recipe/grill/sushi_sake/@SUBTYPES{@OLD} -/obj/item/food/sushi_TobikoEgg/@SUBTYPES : /obj/item/food/sliced/sushi_tobiko_egg/@SUBTYPES{@OLD} +/obj/item/food/sushi_TobikoEgg/@SUBTYPES : /obj/item/food/sushi_tobiko_egg/@SUBTYPES{@OLD} /datum/ErrorViewer/ErrorCache/@SUBTYPES : /datum/error_viewer/error_cache/@SUBTYPES{@OLD} /datum/ErrorViewer/ErrorEntry/@SUBTYPES : /datum/error_viewer/error_entry/@SUBTYPES{@OLD} /datum/recipe/grill/sushi_Ebi/@SUBTYPES : /datum/recipe/grill/sushi_ebi/@SUBTYPES{@OLD} @@ -142,23 +142,23 @@ /area/ruin/unpowered/BMPship/@SUBTYPES : /area/ruin/unpowered/bmp_ship/@SUBTYPES{@OLD} /datum/dog_fashion/head/HoS/@SUBTYPES : /datum/dog_fashion/head/hos/@SUBTYPES{@OLD} /obj/item/clothing/head/HoS/@SUBTYPES : /obj/item/clothing/head/hos/@SUBTYPES{@OLD} -/obj/item/food/sliced/sushi_masago/@SUBTYPES : /obj/item/food/sliced/sushi_masago/@SUBTYPES{@OLD} -/obj/item/food/sliced/sushi_tamago/@SUBTYPES : /obj/item/food/sliced/sushi_tamago/@SUBTYPES{@OLD} -/obj/item/food/sliced/sushi_tobiko/@SUBTYPES : /obj/item/food/sliced/sushi_tobiko/@SUBTYPES{@OLD} +/obj/item/food/sushi_Masago/@SUBTYPES : /obj/item/food/sushi_masago/@SUBTYPES{@OLD} +/obj/item/food/sushi_Tamago/@SUBTYPES : /obj/item/food/sushi_tamago/@SUBTYPES{@OLD} +/obj/item/food/sushi_Tobiko/@SUBTYPES : /obj/item/food/sushi_tobiko/@SUBTYPES{@OLD} /obj/item/stack/packageWrap/@SUBTYPES : /obj/item/stack/package_wrap/@SUBTYPES{@OLD} /datum/crafting_recipe/IED/@SUBTYPES : /datum/crafting_recipe/ied/@SUBTYPES{@OLD} /datum/middleClickOverride/@SUBTYPES : /datum/middle_click_override/@SUBTYPES{@OLD} /obj/item/food/sushi_Ikura/@SUBTYPES : /obj/item/food/sushi_ikura/@SUBTYPES{@OLD} -/obj/item/food/sliced/sushi_inari/@SUBTYPES : /obj/item/food/sliced/sushi_inari/@SUBTYPES{@OLD} +/obj/item/food/sushi_Inari/@SUBTYPES : /obj/item/food/sushi_inari/@SUBTYPES{@OLD} /obj/item/food/sushi_Unagi/@SUBTYPES : /obj/item/food/sushi_unagi/@SUBTYPES{@OLD} /obj/item/storage/box/PDAs/@SUBTYPES : /obj/item/storage/box/pdas/@SUBTYPES{@OLD} /obj/structure/bigDelivery/@SUBTYPES : /obj/structure/big_delivery/@SUBTYPES{@OLD} /datum/mapGeneratorModule/@SUBTYPES : /datum/map_generator_module/@SUBTYPES{@OLD} -/obj/item/food/sliced/sushi_sake/@SUBTYPES : /obj/item/food/sliced/sushi_sake/@SUBTYPES{@OLD} +/obj/item/food/sushi_Sake/@SUBTYPES : /obj/item/food/sushi_sake/@SUBTYPES{@OLD} /obj/item/shippingPackage/@SUBTYPES : /obj/item/shipping_package/@SUBTYPES{@OLD} /obj/item/aiModule/toyAI/@SUBTYPES : /obj/item/aiModule/toy_ai/@SUBTYPES{@OLD} /obj/item/food/sushi_Ebi/@SUBTYPES : /obj/item/food/sushi_ebi/@SUBTYPES{@OLD} -/obj/item/food/sliced/sushi_tai/@SUBTYPES : /obj/item/food/sliced/sushi_tai/@SUBTYPES{@OLD} +/obj/item/food/sushi_Tai/@SUBTYPES : /obj/item/food/sushi_tai/@SUBTYPES{@OLD} /obj/item/smallDelivery/@SUBTYPES : /obj/item/small_delivery/@SUBTYPES{@OLD} /datum/design/BS_RPED/@SUBTYPES : /datum/design/bs_rped/@SUBTYPES{@OLD} /obj/item/paper/Court/@SUBTYPES : /obj/item/paper/court/@SUBTYPES{@OLD} diff --git a/tools/pr_sql/27268/snake_case_type_remap.json b/tools/pr_sql/27268/snake_case_type_remap.json index 06cd99e97e23..1736a89de6f1 100644 --- a/tools/pr_sql/27268/snake_case_type_remap.json +++ b/tools/pr_sql/27268/snake_case_type_remap.json @@ -24,106 +24,31 @@ "replace": "/area/ruin/unpowered/bm_pship/midship", "override": "/area/ruin/unpowered/bmp_ship/midship" }, - { - "original": "/area/station/security/prison/cell_block/A", - "replace": "/area/station/security/prison/cell_block/a" - }, - { - "original": "/atom/movable/screen/act_intent/robot/AI", - "replace": "/atom/movable/screen/act_intent/robot/ai" - }, - { - "original": "/atom/movable/screen/blob/BlobHelp", - "replace": "/atom/movable/screen/blob/blob_help" - }, - { - "original": "/atom/movable/screen/blob/Blobbernaut", - "replace": "/atom/movable/screen/blob/blobbernaut" - }, - { - "original": "/atom/movable/screen/blob/FactoryBlob", - "replace": "/atom/movable/screen/blob/factory_blob" - }, - { - "original": "/atom/movable/screen/blob/JumpToCore", - "replace": "/atom/movable/screen/blob/jump_to_core" - }, - { - "original": "/atom/movable/screen/blob/JumpToNode", - "replace": "/atom/movable/screen/blob/jump_to_node" - }, - { - "original": "/atom/movable/screen/blob/NodeBlob", - "replace": "/atom/movable/screen/blob/node_blob" - }, - { - "original": "/atom/movable/screen/blob/ReadaptChemical", - "replace": "/atom/movable/screen/blob/readapt_chemical" - }, - { - "original": "/atom/movable/screen/blob/RelocateCore", - "replace": "/atom/movable/screen/blob/relocate_core" - }, - { - "original": "/atom/movable/screen/blob/ResourceBlob", - "replace": "/atom/movable/screen/blob/resource_blob" - }, - { - "original": "/atom/movable/screen/blob/Split", - "replace": "/atom/movable/screen/blob/split" - }, - { - "original": "/atom/movable/screen/blob/StorageBlob", - "replace": "/atom/movable/screen/blob/storage_blob" - }, - { - "original": "/atom/movable/screen/guardian/Communicate", - "replace": "/atom/movable/screen/guardian/communicate" - }, - { - "original": "/atom/movable/screen/guardian/Manifest", - "replace": "/atom/movable/screen/guardian/manifest" - }, - { - "original": "/atom/movable/screen/guardian/Recall", - "replace": "/atom/movable/screen/guardian/recall" - }, - { - "original": "/atom/movable/screen/guardian/ToggleLight", - "replace": "/atom/movable/screen/guardian/toggle_light" - }, - { - "original": "/atom/movable/screen/guardian/ToggleMode", - "replace": "/atom/movable/screen/guardian/toggle_mode" - }, - { - "original": "/datum/AI_Module", - "replace": "/datum/ai_module" - }, - { - "original": "/datum/ErrorViewer", - "replace": "/datum/error_viewer" - }, - { - "original": "/datum/ErrorViewer/ErrorCache", - "replace": "/datum/error_viewer/error_cache" - }, - { - "original": "/datum/ErrorViewer/ErrorEntry", - "replace": "/datum/error_viewer/error_entry" - }, - { - "original": "/datum/ErrorViewer/ErrorSource", - "replace": "/datum/error_viewer/error_source" - }, - { - "original": "/datum/SDQL_parser", - "replace": "/datum/sdql_parser" - }, - { - "original": "/datum/action/changeling/absorbDNA", - "replace": "/datum/action/changeling/absorb_dna" - }, + { "original": "/area/station/security/prison/cell_block/A", "replace": "/area/station/security/prison/cell_block/a" }, + { "original": "/atom/movable/screen/act_intent/robot/AI", "replace": "/atom/movable/screen/act_intent/robot/ai" }, + { "original": "/atom/movable/screen/blob/BlobHelp", "replace": "/atom/movable/screen/blob/blob_help" }, + { "original": "/atom/movable/screen/blob/Blobbernaut", "replace": "/atom/movable/screen/blob/blobbernaut" }, + { "original": "/atom/movable/screen/blob/FactoryBlob", "replace": "/atom/movable/screen/blob/factory_blob" }, + { "original": "/atom/movable/screen/blob/JumpToCore", "replace": "/atom/movable/screen/blob/jump_to_core" }, + { "original": "/atom/movable/screen/blob/JumpToNode", "replace": "/atom/movable/screen/blob/jump_to_node" }, + { "original": "/atom/movable/screen/blob/NodeBlob", "replace": "/atom/movable/screen/blob/node_blob" }, + { "original": "/atom/movable/screen/blob/ReadaptChemical", "replace": "/atom/movable/screen/blob/readapt_chemical" }, + { "original": "/atom/movable/screen/blob/RelocateCore", "replace": "/atom/movable/screen/blob/relocate_core" }, + { "original": "/atom/movable/screen/blob/ResourceBlob", "replace": "/atom/movable/screen/blob/resource_blob" }, + { "original": "/atom/movable/screen/blob/Split", "replace": "/atom/movable/screen/blob/split" }, + { "original": "/atom/movable/screen/blob/StorageBlob", "replace": "/atom/movable/screen/blob/storage_blob" }, + { "original": "/atom/movable/screen/guardian/Communicate", "replace": "/atom/movable/screen/guardian/communicate" }, + { "original": "/atom/movable/screen/guardian/Manifest", "replace": "/atom/movable/screen/guardian/manifest" }, + { "original": "/atom/movable/screen/guardian/Recall", "replace": "/atom/movable/screen/guardian/recall" }, + { "original": "/atom/movable/screen/guardian/ToggleLight", "replace": "/atom/movable/screen/guardian/toggle_light" }, + { "original": "/atom/movable/screen/guardian/ToggleMode", "replace": "/atom/movable/screen/guardian/toggle_mode" }, + { "original": "/datum/AI_Module", "replace": "/datum/ai_module" }, + { "original": "/datum/ErrorViewer", "replace": "/datum/error_viewer" }, + { "original": "/datum/ErrorViewer/ErrorCache", "replace": "/datum/error_viewer/error_cache" }, + { "original": "/datum/ErrorViewer/ErrorEntry", "replace": "/datum/error_viewer/error_entry" }, + { "original": "/datum/ErrorViewer/ErrorSource", "replace": "/datum/error_viewer/error_source" }, + { "original": "/datum/SDQL_parser", "replace": "/datum/sdql_parser" }, + { "original": "/datum/action/changeling/absorbDNA", "replace": "/datum/action/changeling/absorb_dna" }, { "original": "/datum/action/item_action/YEEEAAAAAHHHHHHHHHHHHH", "replace": "/datum/action/item_action/yeeeaaaaahhhhhhhhhhhhh" @@ -132,148 +57,45 @@ "original": "/datum/action/item_action/equip_unequip_TED_Gun", "replace": "/datum/action/item_action/equip_unequip_ted_gun" }, - { - "original": "/datum/bottler_recipe/Applepocalypse", - "replace": "/datum/bottler_recipe/applepocalypse" - }, - { - "original": "/datum/bottler_recipe/Berry_Banned", - "replace": "/datum/bottler_recipe/berry_banned" - }, - { - "original": "/datum/bottler_recipe/Berry_Banned2", - "replace": "/datum/bottler_recipe/berry_banned2" - }, - { - "original": "/datum/bottler_recipe/Blackeye_Brew", - "replace": "/datum/bottler_recipe/blackeye_brew" - }, - { - "original": "/datum/bottler_recipe/Grape_Granade", - "replace": "/datum/bottler_recipe/grape_granade" - }, - { - "original": "/datum/bottler_recipe/Meteor_Malt", - "replace": "/datum/bottler_recipe/meteor_malt" - }, - { - "original": "/datum/bottler_recipe/Paradise_Punch", - "replace": "/datum/bottler_recipe/paradise_punch" - }, - { - "original": "/datum/chemical_reaction/kahluaVodka", - "replace": "/datum/chemical_reaction/kahlua_vodka" - }, - { - "original": "/datum/chemical_reaction/slimeRNG", - "replace": "/datum/chemical_reaction/slime_rng" - }, - { - "original": "/datum/crafting_recipe/Ebi_maki", - "replace": "/datum/crafting_recipe/ebi_maki" - }, - { - "original": "/datum/crafting_recipe/IED", - "replace": "/datum/crafting_recipe/ied" - }, - { - "original": "/datum/crafting_recipe/Ikura_maki", - "replace": "/datum/crafting_recipe/ikura_maki" - }, - { - "original": "/datum/crafting_recipe/Inari_maki", - "replace": "/datum/crafting_recipe/inari_maki" - }, - { - "original": "/datum/crafting_recipe/Masago_maki", - "replace": "/datum/crafting_recipe/masago_maki" - }, - { - "original": "/datum/crafting_recipe/Sake_maki", - "replace": "/datum/crafting_recipe/sake_maki" - }, - { - "original": "/datum/crafting_recipe/SmokedSalmon_maki", - "replace": "/datum/crafting_recipe/smoked_salmon_maki" - }, - { - "original": "/datum/crafting_recipe/Tai_maki", - "replace": "/datum/crafting_recipe/tai_maki" - }, - { - "original": "/datum/crafting_recipe/TobikoEgg_maki", - "replace": "/datum/crafting_recipe/tobiko_egg_maki" - }, - { - "original": "/datum/crafting_recipe/Tobiko_maki", - "replace": "/datum/crafting_recipe/tobiko_maki" - }, - { - "original": "/datum/crafting_recipe/sushi_Ebi", - "replace": "/datum/crafting_recipe/sushi_ebi" - }, - { - "original": "/datum/crafting_recipe/sushi_Ikura", - "replace": "/datum/crafting_recipe/sushi_ikura" - }, - { - "original": "/datum/crafting_recipe/sushi_Inari", - "replace": "/datum/crafting_recipe/sushi_inari" - }, - { - "original": "/datum/crafting_recipe/sushi_Masago", - "replace": "/datum/crafting_recipe/sushi_masago" - }, - { - "original": "/datum/crafting_recipe/sushi_Sake", - "replace": "/datum/crafting_recipe/sushi_sake" - }, - { - "original": "/datum/crafting_recipe/sushi_SmokedSalmon", - "replace": "/datum/crafting_recipe/sushi_smoked_salmon" - }, - { - "original": "/datum/crafting_recipe/sushi_Tai", - "replace": "/datum/crafting_recipe/sushi_tai" - }, - { - "original": "/datum/crafting_recipe/sushi_Tobiko", - "replace": "/datum/crafting_recipe/sushi_tobiko" - }, - { - "original": "/datum/crafting_recipe/sushi_TobikoEgg", - "replace": "/datum/crafting_recipe/sushi_tobiko_egg" - }, - { - "original": "/datum/design/BS_RPED", - "replace": "/datum/design/bs_rped" - }, - { - "original": "/datum/design/RPED", - "replace": "/datum/design/rped" - }, + { "original": "/datum/bottler_recipe/Applepocalypse", "replace": "/datum/bottler_recipe/applepocalypse" }, + { "original": "/datum/bottler_recipe/Berry_Banned", "replace": "/datum/bottler_recipe/berry_banned" }, + { "original": "/datum/bottler_recipe/Berry_Banned2", "replace": "/datum/bottler_recipe/berry_banned2" }, + { "original": "/datum/bottler_recipe/Blackeye_Brew", "replace": "/datum/bottler_recipe/blackeye_brew" }, + { "original": "/datum/bottler_recipe/Grape_Granade", "replace": "/datum/bottler_recipe/grape_granade" }, + { "original": "/datum/bottler_recipe/Meteor_Malt", "replace": "/datum/bottler_recipe/meteor_malt" }, + { "original": "/datum/bottler_recipe/Paradise_Punch", "replace": "/datum/bottler_recipe/paradise_punch" }, + { "original": "/datum/chemical_reaction/kahluaVodka", "replace": "/datum/chemical_reaction/kahlua_vodka" }, + { "original": "/datum/chemical_reaction/slimeRNG", "replace": "/datum/chemical_reaction/slime_rng" }, + { "original": "/datum/crafting_recipe/Ebi_maki", "replace": "/datum/crafting_recipe/ebi_maki" }, + { "original": "/datum/crafting_recipe/IED", "replace": "/datum/crafting_recipe/ied" }, + { "original": "/datum/crafting_recipe/Ikura_maki", "replace": "/datum/crafting_recipe/ikura_maki" }, + { "original": "/datum/crafting_recipe/Inari_maki", "replace": "/datum/crafting_recipe/inari_maki" }, + { "original": "/datum/crafting_recipe/Masago_maki", "replace": "/datum/crafting_recipe/masago_maki" }, + { "original": "/datum/crafting_recipe/Sake_maki", "replace": "/datum/crafting_recipe/sake_maki" }, + { "original": "/datum/crafting_recipe/SmokedSalmon_maki", "replace": "/datum/crafting_recipe/smoked_salmon_maki" }, + { "original": "/datum/crafting_recipe/Tai_maki", "replace": "/datum/crafting_recipe/tai_maki" }, + { "original": "/datum/crafting_recipe/TobikoEgg_maki", "replace": "/datum/crafting_recipe/tobiko_egg_maki" }, + { "original": "/datum/crafting_recipe/Tobiko_maki", "replace": "/datum/crafting_recipe/tobiko_maki" }, + { "original": "/datum/crafting_recipe/sushi_Ebi", "replace": "/datum/crafting_recipe/sushi_ebi" }, + { "original": "/datum/crafting_recipe/sushi_Ikura", "replace": "/datum/crafting_recipe/sushi_ikura" }, + { "original": "/datum/crafting_recipe/sushi_Inari", "replace": "/datum/crafting_recipe/sushi_inari" }, + { "original": "/datum/crafting_recipe/sushi_Masago", "replace": "/datum/crafting_recipe/sushi_masago" }, + { "original": "/datum/crafting_recipe/sushi_Sake", "replace": "/datum/crafting_recipe/sushi_sake" }, + { "original": "/datum/crafting_recipe/sushi_SmokedSalmon", "replace": "/datum/crafting_recipe/sushi_smoked_salmon" }, + { "original": "/datum/crafting_recipe/sushi_Tai", "replace": "/datum/crafting_recipe/sushi_tai" }, + { "original": "/datum/crafting_recipe/sushi_Tobiko", "replace": "/datum/crafting_recipe/sushi_tobiko" }, + { "original": "/datum/crafting_recipe/sushi_TobikoEgg", "replace": "/datum/crafting_recipe/sushi_tobiko_egg" }, + { "original": "/datum/design/BS_RPED", "replace": "/datum/design/bs_rped" }, + { "original": "/datum/design/RPED", "replace": "/datum/design/rped" }, { "original": "/datum/dog_fashion/head/HoS", "replace": "/datum/dog_fashion/head/ho_s", "override": "/datum/dog_fashion/head/hos" }, - { - "original": "/datum/gear/pAI", - "replace": "/datum/gear/p_ai", - "override": "/datum/gear/pai" - }, - { - "original": "/datum/holiday/UFO", - "replace": "/datum/holiday/ufo" - }, - { - "original": "/datum/mapGenerator", - "replace": "/datum/map_generator" - }, - { - "original": "/datum/mapGeneratorModule", - "replace": "/datum/map_generator_module" - }, + { "original": "/datum/gear/pAI", "replace": "/datum/gear/p_ai", "override": "/datum/gear/pai" }, + { "original": "/datum/holiday/UFO", "replace": "/datum/holiday/ufo" }, + { "original": "/datum/mapGenerator", "replace": "/datum/map_generator" }, + { "original": "/datum/mapGeneratorModule", "replace": "/datum/map_generator_module" }, { "original": "/datum/mapGeneratorModule/border/asteroidWalls", "replace": "/datum/map_generator_module/border/asteroid_walls" @@ -282,10 +104,7 @@ "original": "/datum/mapGeneratorModule/border/syndieWalls", "replace": "/datum/map_generator_module/border/syndie_walls" }, - { - "original": "/datum/mapGeneratorModule/bottomLayer", - "replace": "/datum/map_generator_module/bottom_layer" - }, + { "original": "/datum/mapGeneratorModule/bottomLayer", "replace": "/datum/map_generator_module/bottom_layer" }, { "original": "/datum/mapGeneratorModule/bottomLayer/asteroidTurfs", "replace": "/datum/map_generator_module/bottom_layer/asteroid_turfs" @@ -302,34 +121,16 @@ "original": "/datum/mapGeneratorModule/bottomLayer/syndieFloor", "replace": "/datum/map_generator_module/bottom_layer/syndie_floor" }, - { - "original": "/datum/mapGeneratorModule/deadTrees", - "replace": "/datum/map_generator_module/dead_trees" - }, - { - "original": "/datum/mapGeneratorModule/denseLayer", - "replace": "/datum/map_generator_module/dense_layer" - }, + { "original": "/datum/mapGeneratorModule/deadTrees", "replace": "/datum/map_generator_module/dead_trees" }, + { "original": "/datum/mapGeneratorModule/denseLayer", "replace": "/datum/map_generator_module/dense_layer" }, { "original": "/datum/mapGeneratorModule/denseLayer/grassTufts", "replace": "/datum/map_generator_module/dense_layer/grass_tufts" }, - { - "original": "/datum/mapGeneratorModule/pineTrees", - "replace": "/datum/map_generator_module/pine_trees" - }, - { - "original": "/datum/mapGeneratorModule/randBushes", - "replace": "/datum/map_generator_module/rand_bushes" - }, - { - "original": "/datum/mapGeneratorModule/randRocks", - "replace": "/datum/map_generator_module/rand_rocks" - }, - { - "original": "/datum/mapGeneratorModule/splatterLayer", - "replace": "/datum/map_generator_module/splatter_layer" - }, + { "original": "/datum/mapGeneratorModule/pineTrees", "replace": "/datum/map_generator_module/pine_trees" }, + { "original": "/datum/mapGeneratorModule/randBushes", "replace": "/datum/map_generator_module/rand_bushes" }, + { "original": "/datum/mapGeneratorModule/randRocks", "replace": "/datum/map_generator_module/rand_rocks" }, + { "original": "/datum/mapGeneratorModule/splatterLayer", "replace": "/datum/map_generator_module/splatter_layer" }, { "original": "/datum/mapGeneratorModule/splatterLayer/asteroidMonsters", "replace": "/datum/map_generator_module/splatter_layer/asteroid_monsters" @@ -346,82 +147,25 @@ "original": "/datum/mapGeneratorModule/syndieFurniture", "replace": "/datum/map_generator_module/syndie_furniture" }, - { - "original": "/datum/middleClickOverride", - "replace": "/datum/middle_click_override" - }, - { - "original": "/datum/middleClickOverride/badminClicker", - "replace": "/datum/middle_click_override/badmin_clicker" - }, - { - "original": "/datum/objective/abductee/POWERUNLIMITED", - "replace": "/datum/objective/abductee/powerunlimited" - }, - { - "original": "/datum/objective/revenantFluff", - "replace": "/datum/objective/revenant_fluff" - }, - { - "original": "/datum/paiController", - "replace": "/datum/pai_controller" - }, - { - "original": "/datum/prize_item/AI", - "replace": "/datum/prize_item/ai" - }, - { - "original": "/datum/recipe/grill/sushi_Ebi", - "replace": "/datum/recipe/grill/sushi_ebi" - }, - { - "original": "/datum/recipe/grill/sushi_Ikura", - "replace": "/datum/recipe/grill/sushi_ikura" - }, - { - "original": "/datum/recipe/grill/sushi_Inari", - "replace": "/datum/recipe/grill/sushi_inari" - }, - { - "original": "/datum/recipe/grill/sushi_Masago", - "replace": "/datum/recipe/grill/sushi_masago" - }, - { - "original": "/datum/recipe/grill/sushi_Sake", - "replace": "/datum/recipe/grill/sushi_sake" - }, - { - "original": "/datum/recipe/grill/sushi_SmokedSalmon", - "replace": "/datum/recipe/grill/sushi_smoked_salmon" - }, - { - "original": "/datum/recipe/grill/sushi_Tai", - "replace": "/datum/recipe/grill/sushi_tai" - }, - { - "original": "/datum/recipe/grill/sushi_Tamago", - "replace": "/datum/recipe/grill/sushi_tamago" - }, - { - "original": "/datum/recipe/grill/sushi_Tobiko", - "replace": "/datum/recipe/grill/sushi_tobiko" - }, - { - "original": "/datum/recipe/grill/sushi_TobikoEgg", - "replace": "/datum/recipe/grill/sushi_tobiko_egg" - }, - { - "original": "/datum/recipe/grill/sushi_Unagi", - "replace": "/datum/recipe/grill/sushi_unagi" - }, - { - "original": "/datum/sortInstance", - "replace": "/datum/sort_instance" - }, - { - "original": "/datum/spell/aoe/conjure/summonEdSwarm", - "replace": "/datum/spell/aoe/conjure/summon_ed_swarm" - }, + { "original": "/datum/middleClickOverride", "replace": "/datum/middle_click_override" }, + { "original": "/datum/middleClickOverride/badminClicker", "replace": "/datum/middle_click_override/badmin_clicker" }, + { "original": "/datum/objective/abductee/POWERUNLIMITED", "replace": "/datum/objective/abductee/powerunlimited" }, + { "original": "/datum/objective/revenantFluff", "replace": "/datum/objective/revenant_fluff" }, + { "original": "/datum/paiController", "replace": "/datum/pai_controller" }, + { "original": "/datum/prize_item/AI", "replace": "/datum/prize_item/ai" }, + { "original": "/datum/recipe/grill/sushi_Ebi", "replace": "/datum/recipe/grill/sushi_ebi" }, + { "original": "/datum/recipe/grill/sushi_Ikura", "replace": "/datum/recipe/grill/sushi_ikura" }, + { "original": "/datum/recipe/grill/sushi_Inari", "replace": "/datum/recipe/grill/sushi_inari" }, + { "original": "/datum/recipe/grill/sushi_Masago", "replace": "/datum/recipe/grill/sushi_masago" }, + { "original": "/datum/recipe/grill/sushi_Sake", "replace": "/datum/recipe/grill/sushi_sake" }, + { "original": "/datum/recipe/grill/sushi_SmokedSalmon", "replace": "/datum/recipe/grill/sushi_smoked_salmon" }, + { "original": "/datum/recipe/grill/sushi_Tai", "replace": "/datum/recipe/grill/sushi_tai" }, + { "original": "/datum/recipe/grill/sushi_Tamago", "replace": "/datum/recipe/grill/sushi_tamago" }, + { "original": "/datum/recipe/grill/sushi_Tobiko", "replace": "/datum/recipe/grill/sushi_tobiko" }, + { "original": "/datum/recipe/grill/sushi_TobikoEgg", "replace": "/datum/recipe/grill/sushi_tobiko_egg" }, + { "original": "/datum/recipe/grill/sushi_Unagi", "replace": "/datum/recipe/grill/sushi_unagi" }, + { "original": "/datum/sortInstance", "replace": "/datum/sort_instance" }, + { "original": "/datum/spell/aoe/conjure/summonEdSwarm", "replace": "/datum/spell/aoe/conjure/summon_ed_swarm" }, { "original": "/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Curled", "replace": "/datum/sprite_accessory/head_accessory/kidan/kidan_mantie_curled" @@ -430,10 +174,7 @@ "original": "/datum/sprite_accessory/head_accessory/kidan/kidan_Mantie_Long", "replace": "/datum/sprite_accessory/head_accessory/kidan/kidan_mantie_long" }, - { - "original": "/datum/status_effect/hippocraticOath", - "replace": "/datum/status_effect/hippocratic_oath" - }, + { "original": "/datum/status_effect/hippocraticOath", "replace": "/datum/status_effect/hippocratic_oath" }, { "original": "/datum/supply_packs/engineering/engine/PA", "replace": "/datum/supply_packs/engineering/engine/pa", @@ -444,55 +185,28 @@ "replace": "/datum/uplink_item/ammo/bulldog_x_lmagsbag", "override": "/datum/uplink_item/ammo/bulldog_xl_magsbag" }, - { - "original": "/datum/uplink_item/bundles_TC", - "replace": "/datum/uplink_item/bundles_tc" - }, - { - "original": "/datum/uplink_item/stealthy_weapons/RSG", - "replace": "/datum/uplink_item/stealthy_weapons/rsg" - }, - { - "original": "/mob/camera/aiEye", - "replace": "/mob/camera/ai_eye" - }, - { - "original": "/mob/living/simple_animal/cockroach/Brad", - "replace": "/mob/living/simple_animal/cockroach/brad" - }, - { - "original": "/mob/living/simple_animal/crab/Coffee", - "replace": "/mob/living/simple_animal/crab/coffee" - }, + { "original": "/datum/uplink_item/bundles_TC", "replace": "/datum/uplink_item/bundles_tc" }, + { "original": "/datum/uplink_item/stealthy_weapons/RSG", "replace": "/datum/uplink_item/stealthy_weapons/rsg" }, + { "original": "/mob/camera/aiEye", "replace": "/mob/camera/ai_eye" }, + { "original": "/mob/living/simple_animal/cockroach/Brad", "replace": "/mob/living/simple_animal/cockroach/brad" }, + { "original": "/mob/living/simple_animal/crab/Coffee", "replace": "/mob/living/simple_animal/crab/coffee" }, { "original": "/mob/living/simple_animal/hostile/bear/Hudson", "replace": "/mob/living/simple_animal/hostile/bear/hudson" }, - { - "original": "/mob/living/simple_animal/mouse/brown/Tom", - "replace": "/mob/living/simple_animal/mouse/brown/tom" - }, + { "original": "/mob/living/simple_animal/mouse/brown/Tom", "replace": "/mob/living/simple_animal/mouse/brown/tom" }, { "original": "/mob/living/simple_animal/mouse/white/Brain", "replace": "/mob/living/simple_animal/mouse/white/brain" }, - { - "original": "/mob/living/simple_animal/parrot/Poly", - "replace": "/mob/living/simple_animal/parrot/poly" - }, + { "original": "/mob/living/simple_animal/parrot/Poly", "replace": "/mob/living/simple_animal/parrot/poly" }, { "original": "/mob/living/simple_animal/pet/cat/Proc", "replace": "/mob/living/simple_animal/pet/cat/proc", "override": "/mob/living/simple_animal/pet/cat/proc_cat" }, - { - "original": "/mob/living/simple_animal/pet/cat/Runtime", - "replace": "/mob/living/simple_animal/pet/cat/runtime" - }, - { - "original": "/mob/living/simple_animal/pet/cat/Syndi", - "replace": "/mob/living/simple_animal/pet/cat/syndi" - }, + { "original": "/mob/living/simple_animal/pet/cat/Runtime", "replace": "/mob/living/simple_animal/pet/cat/runtime" }, + { "original": "/mob/living/simple_animal/pet/cat/Syndi", "replace": "/mob/living/simple_animal/pet/cat/syndi" }, { "original": "/mob/living/simple_animal/pet/cat/Var", "replace": "/mob/living/simple_animal/pet/cat/var", @@ -514,42 +228,15 @@ "original": "/mob/living/simple_animal/pet/dog/fox/Syndifox", "replace": "/mob/living/simple_animal/pet/dog/fox/syndifox" }, - { - "original": "/obj/item/CQC_manual", - "replace": "/obj/item/cqc_manual" - }, - { - "original": "/obj/item/FixOVein", - "replace": "/obj/item/fix_o_vein" - }, - { - "original": "/obj/item/aiModule", - "replace": "/obj/item/ai_module" - }, - { - "original": "/obj/item/aiModule/oneCrewMember", - "replace": "/obj/item/ai_module/one_crew_member" - }, - { - "original": "/obj/item/aiModule/protectStation", - "replace": "/obj/item/ai_module/protect_station" - }, - { - "original": "/obj/item/aiModule/toyAI", - "replace": "/obj/item/aiModule/toy_ai" - }, - { - "original": "/obj/item/ammo_box/magazine/m12g/XtrLrg", - "replace": "/obj/item/ammo_box/magazine/m12g/xtr_lrg" - }, - { - "original": "/obj/item/badminBook", - "replace": "/obj/item/badmin_book" - }, - { - "original": "/obj/item/circuitboard/HolodeckControl", - "replace": "/obj/item/circuitboard/holodeck_control" - }, + { "original": "/obj/item/CQC_manual", "replace": "/obj/item/cqc_manual" }, + { "original": "/obj/item/FixOVein", "replace": "/obj/item/fix_o_vein" }, + { "original": "/obj/item/aiModule", "replace": "/obj/item/ai_module" }, + { "original": "/obj/item/aiModule/oneCrewMember", "replace": "/obj/item/ai_module/one_crew_member" }, + { "original": "/obj/item/aiModule/protectStation", "replace": "/obj/item/ai_module/protect_station" }, + { "original": "/obj/item/aiModule/toyAI", "replace": "/obj/item/aiModule/toy_ai" }, + { "original": "/obj/item/ammo_box/magazine/m12g/XtrLrg", "replace": "/obj/item/ammo_box/magazine/m12g/xtr_lrg" }, + { "original": "/obj/item/badminBook", "replace": "/obj/item/badmin_book" }, + { "original": "/obj/item/circuitboard/HolodeckControl", "replace": "/obj/item/circuitboard/holodeck_control" }, { "original": "/obj/item/clothing/accessory/medal/fluff/XannZxiax", "replace": "/obj/item/clothing/accessory/medal/fluff/xann_zxiax" @@ -569,110 +256,38 @@ "replace": "/obj/item/clothing/head/collectable/ho_s", "override": "/obj/item/clothing/head/collectable/hos" }, - { - "original": "/obj/item/destTagger", - "replace": "/obj/item/dest_tagger" - }, - { - "original": "/obj/item/food/sliceable/Ebi_maki", - "replace": "/obj/item/food/sliceable/ebi_maki" - }, - { - "original": "/obj/item/food/sliceable/Ikura_maki", - "replace": "/obj/item/food/sliceable/ikura_maki" - }, - { - "original": "/obj/item/food/sliceable/Inari_maki", - "replace": "/obj/item/food/sliceable/inari_maki" - }, - { - "original": "/obj/item/food/sliceable/Masago_maki", - "replace": "/obj/item/food/sliceable/masago_maki" - }, - { - "original": "/obj/item/food/sliceable/Sake_maki", - "replace": "/obj/item/food/sliceable/sake_maki" - }, + { "original": "/obj/item/destTagger", "replace": "/obj/item/dest_tagger" }, + { "original": "/obj/item/food/sliceable/Ebi_maki", "replace": "/obj/item/food/sliceable/ebi_maki" }, + { "original": "/obj/item/food/sliceable/Ikura_maki", "replace": "/obj/item/food/sliceable/ikura_maki" }, + { "original": "/obj/item/food/sliceable/Inari_maki", "replace": "/obj/item/food/sliceable/inari_maki" }, + { "original": "/obj/item/food/sliceable/Masago_maki", "replace": "/obj/item/food/sliceable/masago_maki" }, + { "original": "/obj/item/food/sliceable/Sake_maki", "replace": "/obj/item/food/sliceable/sake_maki" }, { "original": "/obj/item/food/sliceable/SmokedSalmon_maki", "replace": "/obj/item/food/sliceable/smoked_salmon_maki" }, - { - "original": "/obj/item/food/sliceable/Tai_maki", - "replace": "/obj/item/food/sliceable/tai_maki" - }, - { - "original": "/obj/item/food/sliceable/Tamago_maki", - "replace": "/obj/item/food/sliceable/tamago_maki" - }, - { - "original": "/obj/item/food/sliceable/TobikoEgg_maki", - "replace": "/obj/item/food/sliceable/tobiko_egg_maki" - }, - { - "original": "/obj/item/food/sliceable/Tobiko_maki", - "replace": "/obj/item/food/sliceable/tobiko_maki" - }, - { - "original": "/obj/item/food/sushi_Ebi", - "replace": "/obj/item/food/sushi_ebi" - }, - { - "original": "/obj/item/food/sushi_Ikura", - "replace": "/obj/item/food/sushi_ikura" - }, - { - "original": "/obj/item/food/sliced/sushi_inari", - "replace": "/obj/item/food/sliced/sushi_inari" - }, - { - "original": "/obj/item/food/sliced/sushi_masago", - "replace": "/obj/item/food/sliced/sushi_masago" - }, - { - "original": "/obj/item/food/sliced/sushi_sake", - "replace": "/obj/item/food/sliced/sushi_sake" - }, - { - "original": "/obj/item/food/sushi_SmokedSalmon", - "replace": "/obj/item/food/sliced/sushi_smoked_salmon" - }, - { - "original": "/obj/item/food/sliced/sushi_tai", - "replace": "/obj/item/food/sliced/sushi_tai" - }, - { - "original": "/obj/item/food/sliced/sushi_tamago", - "replace": "/obj/item/food/sliced/sushi_tamago" - }, - { - "original": "/obj/item/food/sliced/sushi_tobiko", - "replace": "/obj/item/food/sliced/sushi_tobiko" - }, - { - "original": "/obj/item/food/sushi_TobikoEgg", - "replace": "/obj/item/food/sliced/sushi_tobiko_egg" - }, - { - "original": "/obj/item/food/sushi_Unagi", - "replace": "/obj/item/food/sushi_unagi" - }, + { "original": "/obj/item/food/sliceable/Tai_maki", "replace": "/obj/item/food/sliceable/tai_maki" }, + { "original": "/obj/item/food/sliceable/Tamago_maki", "replace": "/obj/item/food/sliceable/tamago_maki" }, + { "original": "/obj/item/food/sliceable/TobikoEgg_maki", "replace": "/obj/item/food/sliceable/tobiko_egg_maki" }, + { "original": "/obj/item/food/sliceable/Tobiko_maki", "replace": "/obj/item/food/sliceable/tobiko_maki" }, + { "original": "/obj/item/food/sushi_Ebi", "replace": "/obj/item/food/sushi_ebi" }, + { "original": "/obj/item/food/sushi_Ikura", "replace": "/obj/item/food/sushi_ikura" }, + { "original": "/obj/item/food/sushi_Inari", "replace": "/obj/item/food/sushi_inari" }, + { "original": "/obj/item/food/sushi_Masago", "replace": "/obj/item/food/sushi_masago" }, + { "original": "/obj/item/food/sushi_Sake", "replace": "/obj/item/food/sushi_sake" }, + { "original": "/obj/item/food/sushi_SmokedSalmon", "replace": "/obj/item/food/sushi_smoked_salmon" }, + { "original": "/obj/item/food/sushi_Tai", "replace": "/obj/item/food/sushi_tai" }, + { "original": "/obj/item/food/sushi_Tamago", "replace": "/obj/item/food/sushi_tamago" }, + { "original": "/obj/item/food/sushi_Tobiko", "replace": "/obj/item/food/sushi_tobiko" }, + { "original": "/obj/item/food/sushi_TobikoEgg", "replace": "/obj/item/food/sushi_tobiko_egg" }, + { "original": "/obj/item/food/sushi_Unagi", "replace": "/obj/item/food/sushi_unagi" }, { "original": "/obj/item/gun/projectile/automatic/pistol/APS", "replace": "/obj/item/gun/projectile/automatic/pistol/aps" }, - { - "original": "/obj/item/paper/Court", - "replace": "/obj/item/paper/court" - }, - { - "original": "/obj/item/paper/Toxin", - "replace": "/obj/item/paper/toxin" - }, - { - "original": "/obj/item/reagent_containers/hypospray/CMO", - "replace": "/obj/item/reagent_containers/hypospray/cmo" - }, + { "original": "/obj/item/paper/Court", "replace": "/obj/item/paper/court" }, + { "original": "/obj/item/paper/Toxin", "replace": "/obj/item/paper/toxin" }, + { "original": "/obj/item/reagent_containers/hypospray/CMO", "replace": "/obj/item/reagent_containers/hypospray/cmo" }, { "original": "/obj/item/reagent_containers/iv_bag/blood/AMinus", "replace": "/obj/item/reagent_containers/iv_bag/blood/a_minus" @@ -697,18 +312,9 @@ "original": "/obj/item/reagent_containers/iv_bag/blood/OPlus", "replace": "/obj/item/reagent_containers/iv_bag/blood/o_plus" }, - { - "original": "/obj/item/shippingPackage", - "replace": "/obj/item/shipping_package" - }, - { - "original": "/obj/item/smallDelivery", - "replace": "/obj/item/small_delivery" - }, - { - "original": "/obj/item/stack/packageWrap", - "replace": "/obj/item/stack/package_wrap" - }, + { "original": "/obj/item/shippingPackage", "replace": "/obj/item/shipping_package" }, + { "original": "/obj/item/smallDelivery", "replace": "/obj/item/small_delivery" }, + { "original": "/obj/item/stack/packageWrap", "replace": "/obj/item/stack/package_wrap" }, { "original": "/obj/item/storage/backpack/duffel/syndie/shotgunXLmags", "replace": "/obj/item/storage/backpack/duffel/syndie/shotgun_x_lmags", @@ -719,33 +325,11 @@ "replace": "/obj/item/storage/box/pd_as", "override": "/obj/item/storage/box/pdas" }, - { - "original": "/obj/item/toy/AI", - "replace": "/obj/item/toy/ai" - }, - { - "original": "/obj/machinery/computer/HolodeckControl", - "replace": "/obj/machinery/computer/holodeck_control" - }, - { - "original": "/obj/machinery/disposal/deliveryChute", - "replace": "/obj/machinery/disposal/delivery_chute" - }, - { - "original": "/obj/structure/AIcore", - "replace": "/obj/structure/a_icore", - "override": "/obj/structure/ai_core" - }, - { - "original": "/obj/structure/bigDelivery", - "replace": "/obj/structure/big_delivery" - }, - { - "original": "/obj/structure/closet/secure_closet/CMO", - "replace": "/obj/structure/closet/secure_closet/cmo" - }, - { - "original": "/obj/structure/closet/secure_closet/RD", - "replace": "/obj/structure/closet/secure_closet/rd" - } -] \ No newline at end of file + { "original": "/obj/item/toy/AI", "replace": "/obj/item/toy/ai" }, + { "original": "/obj/machinery/computer/HolodeckControl", "replace": "/obj/machinery/computer/holodeck_control" }, + { "original": "/obj/machinery/disposal/deliveryChute", "replace": "/obj/machinery/disposal/delivery_chute" }, + { "original": "/obj/structure/AIcore", "replace": "/obj/structure/a_icore", "override": "/obj/structure/ai_core" }, + { "original": "/obj/structure/bigDelivery", "replace": "/obj/structure/big_delivery" }, + { "original": "/obj/structure/closet/secure_closet/CMO", "replace": "/obj/structure/closet/secure_closet/cmo" }, + { "original": "/obj/structure/closet/secure_closet/RD", "replace": "/obj/structure/closet/secure_closet/rd" } +] From 7f3a39b71fb544b5d26b907acccb8d6612104fb5 Mon Sep 17 00:00:00 2001 From: Drsmail Date: Sat, 11 Jan 2025 17:22:15 +0300 Subject: [PATCH 8/8] I don't know how to resolve merge conflicts :) --- code/modules/reagents/chemistry/reagents/food_reagents.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index e9cb483ed0bb..0e3ca91f16e3 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -635,7 +635,7 @@ /datum/reagent/consumable/cheese/reaction_turf(turf/T, volume) if(volume >= 5 && !isspaceturf(T)) - new /obj/item/food/cheesewedge/presliced(T) + new /obj/item/food/sliced/cheesewedge/presliced(T) /datum/reagent/consumable/fake_cheese name = "Cheese substitute"