diff --git a/code/game/objects/items/food/sweets.dm b/code/game/objects/items/food/sweets.dm index 596507fa42f..83fd9905e11 100644 --- a/code/game/objects/items/food/sweets.dm +++ b/code/game/objects/items/food/sweets.dm @@ -40,7 +40,7 @@ desc = "It is only wafer thin." icon_state = "mint" bite_consumption = 1 - food_reagents = list(/datum/reagent/toxin/minttoxin = 2) + food_reagents = list(/datum/reagent/consumable/mintextract = 2) foodtypes = TOXIC | SUGAR food_flags = FOOD_FINGER_FOOD w_class = WEIGHT_CLASS_TINY diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index b386ed51ea9..95d8237dbd6 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -310,7 +310,7 @@ product = /obj/item/food/grown/ash_flora/shavings genes = list(/datum/plant_gene/trait/plant_type/fungal_metabolism, /datum/plant_gene/trait/fire_resistance) growing_icon = 'icons/obj/hydroponics/growing_mushrooms.dmi' - reagents_add = list(/datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/toxin/minttoxin = 0.02) + reagents_add = list(/datum/reagent/consumable/sugar = 0.06, /datum/reagent/consumable/ethanol = 0.04, /datum/reagent/stabilizing_agent = 0.06, /datum/reagent/consumable/mintextract = 0.02) /obj/item/seeds/lavaland/porcini name = "pack of porcini mycelium" diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 190ae1b1235..d2c8d81add1 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -681,7 +681,7 @@ emagged_reagents = list( /datum/reagent/consumable/ethanol, /datum/reagent/iron, - /datum/reagent/toxin/minttoxin, + /datum/reagent/consumable/mintextract, /datum/reagent/consumable/ethanol/atomicbomb, /datum/reagent/consumable/ethanol/fernet ) diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 2621f1cd10f..cbee27a2ceb 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -1095,3 +1095,16 @@ nutriment_factor = 1.5 * REAGENTS_METABOLISM chemical_flags = REAGENT_CAN_BE_SYNTHESIZED default_container = /obj/item/reagent_containers/condiment/creamer + +/datum/reagent/consumable/mintextract + name = "Mint Extract" + description = "Useful for dealing with undesirable customers." + color = "#CF3600" // rgb: 207, 54, 0 + taste_description = "mint" + chemical_flags = REAGENT_CAN_BE_SYNTHESIZED + +/datum/reagent/consumable/mintextract/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) + if(HAS_TRAIT(affected_mob, TRAIT_FAT)) + affected_mob.investigate_log("has been gibbed by consuming [src] while fat.", INVESTIGATE_DEATHS) + affected_mob.inflate_gib() + return ..() diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm index 65c82cb12e2..e16216b4edd 100644 --- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm @@ -207,21 +207,6 @@ . = TRUE ..() -/datum/reagent/toxin/minttoxin - name = "Mint Toxin" - description = "Useful for dealing with undesirable customers." - color = "#CF3600" // rgb: 207, 54, 0 - toxpwr = 0 - taste_description = "mint" - ph = 8 - chemical_flags = REAGENT_CAN_BE_SYNTHESIZED - -/datum/reagent/toxin/minttoxin/on_mob_life(mob/living/carbon/affected_mob, delta_time, times_fired) - if(HAS_TRAIT(affected_mob, TRAIT_FAT)) - affected_mob.investigate_log("has been gibbed by consuming [src] while fat.", INVESTIGATE_DEATHS) - affected_mob.inflate_gib() - return ..() - /datum/reagent/toxin/carpotoxin name = "Carpotoxin" description = "A deadly neurotoxin produced by the dreaded spess carp." 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 77baae04425..07f07ae748e 100644 --- a/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm +++ b/code/modules/research/xenobiology/vatgrowing/samples/cell_lines/common.dm @@ -304,7 +304,7 @@ /datum/reagent/consumable/nutriment/vitamin = 1) suppressive_reagents = list( - /datum/reagent/toxin/minttoxin = -3, + /datum/reagent/consumable/mintextract = -3, /datum/reagent/consumable/frostoil = -2, /datum/reagent/consumable/ice = -1) @@ -530,7 +530,7 @@ suppressive_reagents = list( /datum/reagent/consumable/clownstears = -8, - /datum/reagent/toxin/minttoxin = -6, + /datum/reagent/consumable/mintextract = -6, /datum/reagent/consumable/ethanol/silencer = -3, /datum/reagent/consumable/ethanol/fernet = -3, /datum/reagent/toxin/lipolicide = -3,