diff --git a/code/datums/components/food/ice_cream_holder.dm b/code/datums/components/food/ice_cream_holder.dm index 432d370dd90..41267981187 100644 --- a/code/datums/components/food/ice_cream_holder.dm +++ b/code/datums/components/food/ice_cream_holder.dm @@ -282,7 +282,7 @@ GLOBAL_LIST_INIT_TYPED(ice_cream_flavours, /datum/ice_cream_flavour, init_ice_cr icon_state = "icecream_mob" desc = "filled with bright red ice cream. That's probably not strawberry..." desc_prefix = "A suspicious $CONE_NAME" - reagent_type = /datum/reagent/liquidgibs + reagent_type = /datum/reagent/consumable/liquidgibs hidden = TRUE /datum/ice_cream_flavour/custom diff --git a/code/game/objects/effects/decals/cleanable/humans.dm b/code/game/objects/effects/decals/cleanable/humans.dm index 7d8a7f265df..8a296a00018 100644 --- a/code/game/objects/effects/decals/cleanable/humans.dm +++ b/code/game/objects/effects/decals/cleanable/humans.dm @@ -107,7 +107,7 @@ dryname = "rotting gibs" drydesc = "They look bloody and gruesome while some terrible smell fills the air." - decal_reagent = /datum/reagent/liquidgibs + decal_reagent = /datum/reagent/consumable/liquidgibs reagent_amount = 5 ///Information about the diseases our streaking spawns var/list/streak_diseases diff --git a/code/game/objects/items/clown_items.dm b/code/game/objects/items/clown_items.dm index 08112fe3fd6..f6a1d6c8d0c 100644 --- a/code/game/objects/items/clown_items.dm +++ b/code/game/objects/items/clown_items.dm @@ -56,7 +56,7 @@ /obj/item/soap/homemade desc = "A homemade bar of soap. Smells of... well...." - grind_results = list(/datum/reagent/liquidgibs = 9, /datum/reagent/lye = 9) + grind_results = list(/datum/reagent/consumable/liquidgibs = 9, /datum/reagent/lye = 9) icon_state = "soapgibs" inhand_icon_state = "soapgibs" worn_icon_state = "soapgibs" diff --git a/code/game/objects/items/food/lizard.dm b/code/game/objects/items/food/lizard.dm index 58cfcdf00ab..74528afd341 100644 --- a/code/game/objects/items/food/lizard.dm +++ b/code/game/objects/items/food/lizard.dm @@ -191,7 +191,7 @@ icon_state = "brain_pate" food_reagents = list( /datum/reagent/consumable/nutriment/protein = 8, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, ) tastes = list("brains" = 2) foodtypes = MEAT | VEGETABLES | GORE @@ -641,7 +641,7 @@ food_reagents = list( /datum/reagent/consumable/nutriment/protein = 10, /datum/reagent/blood = 8, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, ) tastes = list("vinegar" = 1, "metal" = 1) foodtypes = MEAT | VEGETABLES | GORE diff --git a/code/game/objects/items/food/soup.dm b/code/game/objects/items/food/soup.dm index e9fa8a99da2..0985c0842d3 100644 --- a/code/game/objects/items/food/soup.dm +++ b/code/game/objects/items/food/soup.dm @@ -229,7 +229,7 @@ /datum/reagent/consumable/nutriment/protein = 6, /datum/reagent/consumable/tomatojuice = 10, /datum/reagent/consumable/nutriment/vitamin = 4, - /datum/reagent/liquidgibs = 3, + /datum/reagent/consumable/liquidgibs = 3, ) tastes = list("tomato" = 1, "squirming" = 1) foodtypes = MEAT | GORE diff --git a/code/game/objects/items/food/spaghetti.dm b/code/game/objects/items/food/spaghetti.dm index b87c2b44b4e..1c92c58b5cd 100644 --- a/code/game/objects/items/food/spaghetti.dm +++ b/code/game/objects/items/food/spaghetti.dm @@ -128,7 +128,7 @@ /datum/reagent/consumable/nutriment = 4, /datum/reagent/consumable/nutriment/protein = 2, /datum/reagent/consumable/nutriment/vitamin = 6, - /datum/reagent/liquidgibs = 3, + /datum/reagent/consumable/liquidgibs = 3, ) tastes = list("noodles" = 1, "meat" = 1) foodtypes = GRAIN | MEAT | VEGETABLES diff --git a/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm b/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm index 4c2fd8952c1..86154f6be85 100644 --- a/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm +++ b/code/modules/mapfluff/ruins/spaceruin_code/oldstation.dm @@ -247,7 +247,7 @@ /datum/reagent/yuck = 5, /datum/reagent/consumable/vitfro = 5, // Supplementary for CELL_LINE_TABLE_GRAPE - /datum/reagent/liquidgibs = 5 + /datum/reagent/consumable/liquidgibs = 5 ) /obj/machinery/computer/old diff --git a/code/modules/mob/living/basic/vermin/mouse.dm b/code/modules/mob/living/basic/vermin/mouse.dm index 5962a39e9bd..9e8cea68791 100644 --- a/code/modules/mob/living/basic/vermin/mouse.dm +++ b/code/modules/mob/living/basic/vermin/mouse.dm @@ -293,7 +293,7 @@ eatverbs = list("devour") food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) foodtypes = GORE | MEAT | RAW - grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5) + grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5) decomp_req_handle = TRUE ant_attracting = FALSE decomp_type = /obj/item/food/deadmouse/moldy @@ -345,7 +345,7 @@ icon_state = "mouse_gray_dead" food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/mold = 10) foodtypes = GORE | MEAT | RAW | GROSS - grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5, /datum/reagent/consumable/mold = 10) + grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5, /datum/reagent/consumable/mold = 10) preserved_food = TRUE /// The mouse AI controller diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm index 03d001871e9..515e69f7028 100644 --- a/code/modules/reagents/chemistry/reagents/other_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm @@ -115,17 +115,18 @@ if(data["blood_DNA"]) bloodsplatter.add_blood_DNA(list(data["blood_DNA"] = data["blood_type"])) -/datum/reagent/liquidgibs +/datum/reagent/consumable/liquidgibs name = "Liquid Gibs" color = "#CC4633" description = "You don't even want to think about what's in here." taste_description = "gross iron" + nutriment_factor = 2 * REAGENTS_METABOLISM material = /datum/material/meat ph = 7.45 chemical_flags = REAGENT_CAN_BE_SYNTHESIZED /datum/glass_style/shot_glass/liquidgibs - required_drink_type = /datum/reagent/liquidgibs + required_drink_type = /datum/reagent/consumable/liquidgibs icon_state = "shotglassred" /datum/reagent/bone_dust diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm index 9adde532156..c4d1ae8d897 100644 --- a/code/modules/reagents/chemistry/recipes/others.dm +++ b/code/modules/reagents/chemistry/recipes/others.dm @@ -84,7 +84,7 @@ reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_OTHER /datum/chemical_reaction/soapification - required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/lye = 10) // requires two scooped gib tiles + required_reagents = list(/datum/reagent/consumable/liquidgibs = 10, /datum/reagent/lye = 10) // requires two scooped gib tiles required_temp = 374 mob_react = FALSE reaction_flags = REACTION_INSTANT @@ -110,7 +110,7 @@ new /obj/item/soap/omega(location) /datum/chemical_reaction/candlefication - required_reagents = list(/datum/reagent/liquidgibs = 5, /datum/reagent/oxygen = 5) // + required_reagents = list(/datum/reagent/consumable/liquidgibs = 5, /datum/reagent/oxygen = 5) // required_temp = 374 mob_react = FALSE reaction_flags = REACTION_INSTANT @@ -122,7 +122,7 @@ new /obj/item/flashlight/flare/candle(location) /datum/chemical_reaction/meatification - required_reagents = list(/datum/reagent/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10) + required_reagents = list(/datum/reagent/consumable/liquidgibs = 10, /datum/reagent/consumable/nutriment = 10, /datum/reagent/carbon = 10) mob_react = FALSE reaction_flags = REACTION_INSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE | REACTION_TAG_OTHER @@ -453,7 +453,7 @@ /datum/chemical_reaction/carpet/red results = list(/datum/reagent/carpet/red = 2) - required_reagents = list(/datum/reagent/carpet/ = 1, /datum/reagent/liquidgibs = 1) + required_reagents = list(/datum/reagent/carpet/ = 1, /datum/reagent/consumable/liquidgibs = 1) /datum/chemical_reaction/carpet/royalblack results = list(/datum/reagent/carpet/royal/black = 2) @@ -568,7 +568,7 @@ //monkey powder heehoo /datum/chemical_reaction/monkey_powder results = list(/datum/reagent/monkey_powder = 5) - required_reagents = list(/datum/reagent/consumable/banana = 1, /datum/reagent/consumable/nutriment=2, /datum/reagent/liquidgibs = 1) + required_reagents = list(/datum/reagent/consumable/banana = 1, /datum/reagent/consumable/nutriment=2, /datum/reagent/consumable/liquidgibs = 1) reaction_flags = REACTION_INSTANT reaction_tags = REACTION_TAG_EASY | REACTION_TAG_UNIQUE diff --git a/code/modules/reagents/reagent_containers/cups/drinks.dm b/code/modules/reagents/reagent_containers/cups/drinks.dm index b293bee30c8..febf61a67b1 100644 --- a/code/modules/reagents/reagent_containers/cups/drinks.dm +++ b/code/modules/reagents/reagent_containers/cups/drinks.dm @@ -143,7 +143,7 @@ /obj/item/reagent_containers/cup/glass/ice/prison name = "dirty ice cup" desc = "Either Nanotrasen's water supply is contaminated, or this machine actually vends lemon, chocolate, and cherry snow cones." - list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/liquidgibs = 5) + list_reagents = list(/datum/reagent/consumable/ice = 25, /datum/reagent/consumable/liquidgibs = 5) /obj/item/reagent_containers/cup/glass/mug // parent type is literally just so empty mug sprites are a thing name = "mug" diff --git a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm index f2c3865d803..f8ec8dd381d 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -9,7 +9,7 @@ required_reagents = list(/datum/reagent/consumable/nutriment/protein) supplementary_reagents = list( /datum/reagent/growthserum = 2, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, /datum/reagent/consumable/cornoil = 2, /datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1, @@ -94,7 +94,7 @@ desc = "Feliform cells" required_reagents = list( /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/liquidgibs) supplementary_reagents = list( /datum/reagent/growthserum = 3, @@ -115,7 +115,7 @@ desc = "Canid cells" required_reagents = list( /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/liquidgibs) supplementary_reagents = list( /datum/reagent/growthserum = 3, @@ -134,7 +134,7 @@ desc = "Squat canid cells" required_reagents = list( /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/liquidgibs) supplementary_reagents = list( /datum/reagent/growthserum = 2, @@ -152,7 +152,7 @@ desc = "Ursine cells" required_reagents = list( /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs, + /datum/reagent/consumable/liquidgibs, /datum/reagent/medicine/c2/synthflesh) //Nuke this if the dispenser becomes xenobio meta. supplementary_reagents = list( @@ -214,7 +214,7 @@ desc = "Ophidic cells" required_reagents = list( /datum/reagent/consumable/nutriment/protein, - /datum/reagent/liquidgibs) + /datum/reagent/consumable/liquidgibs) supplementary_reagents = list( /datum/reagent/growthserum = 3, @@ -239,7 +239,7 @@ supplementary_reagents = list( /datum/reagent/toxin/slimejelly = 2, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, /datum/reagent/consumable/enzyme = 1) suppressive_reagents = list( @@ -257,7 +257,7 @@ supplementary_reagents = list( /datum/reagent/consumable/nutriment/vitamin = 3, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, /datum/reagent/sulfur = 2) suppressive_reagents = list( @@ -277,7 +277,7 @@ supplementary_reagents = list( /datum/reagent/growthserum = 3, /datum/reagent/consumable/nutriment/vitamin = 2, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, /datum/reagent/consumable/eggyolk = 2, /datum/reagent/consumable/shamblers = 1) @@ -300,7 +300,7 @@ /datum/reagent/gold = 2, //This is why they eat so many adventurers. /datum/reagent/consumable/nutriment/peptides = 2, /datum/reagent/consumable/potato_juice = 1, - /datum/reagent/liquidgibs = 1, + /datum/reagent/consumable/liquidgibs = 1, /datum/reagent/consumable/nutriment/vitamin = 1) suppressive_reagents = list( @@ -326,7 +326,7 @@ /datum/reagent/consumable/ethanol/squirt_cider = 2, /datum/reagent/consumable/doctor_delight = 1, /datum/reagent/medicine/salglu_solution = 1, - /datum/reagent/liquidgibs = 1, + /datum/reagent/consumable/liquidgibs = 1, /datum/reagent/consumable/nutriment/vitamin = 1) suppressive_reagents = list( @@ -437,7 +437,7 @@ /datum/reagent/consumable/red_queen = 2, /datum/reagent/consumable/peachjuice = 2, /datum/reagent/uranium = 1, - /datum/reagent/liquidgibs = 1) + /datum/reagent/consumable/liquidgibs = 1) suppressive_reagents = list( /datum/reagent/consumable/salt = -3, @@ -468,7 +468,7 @@ /datum/reagent/consumable/nutriment/peptides = -6, /datum/reagent/consumable/nutriment/protein = -4, /datum/reagent/consumable/nutriment = -3, - /datum/reagent/liquidgibs = -2) + /datum/reagent/consumable/liquidgibs = -2) virus_suspectibility = 0 resulting_atoms = list(/mob/living/simple_animal/hostile/netherworld = 1) @@ -589,7 +589,7 @@ supplementary_reagents = list( /datum/reagent/ants = 3, - /datum/reagent/liquidgibs = 2, + /datum/reagent/consumable/liquidgibs = 2, /datum/reagent/consumable/salt = 1, /datum/reagent/consumable/eggwhite= 1, /datum/reagent/consumable/nutriment/vitamin = 1,) @@ -704,7 +704,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1, /datum/reagent/toxin/plasma = 1, /datum/reagent/consumable/nutriment/organ_tissue = 1, - /datum/reagent/liquidgibs = 1, + /datum/reagent/consumable/liquidgibs = 1, /datum/reagent/consumable/enzyme = 1) suppressive_reagents = list( diff --git a/code/modules/surgery/bodyparts/_bodyparts.dm b/code/modules/surgery/bodyparts/_bodyparts.dm index 15360810521..0d09a5ac06c 100644 --- a/code/modules/surgery/bodyparts/_bodyparts.dm +++ b/code/modules/surgery/bodyparts/_bodyparts.dm @@ -17,7 +17,7 @@ ///The type of husk for building an iconstate var/husk_type = "humanoid" layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor - grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/liquidgibs = 5) // robotic bodyparts and chests/heads cannot be ground + grind_results = list(/datum/reagent/bone_dust = 10, /datum/reagent/consumable/liquidgibs = 5) // robotic bodyparts and chests/heads cannot be ground /// The mob that "owns" this limb /// DO NOT MODIFY DIRECTLY. Use set_owner() var/mob/living/carbon/owner diff --git a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm index 80453efe0b9..f28de1e6ba8 100644 --- a/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm +++ b/modular_skyrat/master_files/code/modules/mob/living/simple_animal/friendly/dogs.dm @@ -23,7 +23,7 @@ speech.speak = markus_speak /datum/chemical_reaction/mark_reaction - results = list(/datum/reagent/liquidgibs = 15) + results = list(/datum/reagent/consumable/liquidgibs = 15) required_reagents = list(/datum/reagent/blood = 20, /datum/reagent/medicine/omnizine = 20, /datum/reagent/medicine/c2/synthflesh = 20, diff --git a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm index 60b918a3539..77d724ac673 100644 --- a/modular_skyrat/modules/basic_mobs/code/bananaspider.dm +++ b/modular_skyrat/modules/basic_mobs/code/bananaspider.dm @@ -41,7 +41,7 @@ icon_state = "bananaspider_peel" food_reagents = list(/datum/reagent/consumable/nutriment = 3, /datum/reagent/consumable/nutriment/vitamin = 2) foodtypes = GORE | MEAT | RAW - grind_results = list(/datum/reagent/blood = 20, /datum/reagent/liquidgibs = 5) + grind_results = list(/datum/reagent/blood = 20, /datum/reagent/consumable/liquidgibs = 5) juice_results = list(/datum/reagent/consumable/banana = 10)