diff --git a/code/__HELPERS/reagents.dm b/code/__HELPERS/reagents.dm index 0a6226e541ae..40f994506f8c 100644 --- a/code/__HELPERS/reagents.dm +++ b/code/__HELPERS/reagents.dm @@ -43,10 +43,5 @@ //there is at least one unique catalyst for the short reaction, so there is no conflict return FALSE - // if either of them have an inhibitor in overlap, - // it probably works - if(length(r1.get_inhibitors() & overlap) || length(r2.get_inhibitors() & overlap)) - return FALSE - //if we got this far, the longer reaction will be impossible to create if the shorter one is earlier in GLOB.chemical_reactions_list, and will require the reagents to be added in a particular order otherwise return TRUE diff --git a/code/modules/reagents/chemistry/reactions/Misc-Recipes.dm b/code/modules/reagents/chemistry/reactions/Misc-Recipes.dm index 2a6c99b9f2e3..453528aeed35 100644 --- a/code/modules/reagents/chemistry/reactions/Misc-Recipes.dm +++ b/code/modules/reagents/chemistry/reactions/Misc-Recipes.dm @@ -86,7 +86,6 @@ id = "ammonia" result = "ammonia" required_reagents = list("hydrogen" = 3, "nitrogen" = 1) - inhibitors = list(MAT_PHORON = 1) // Messes with lexorin result_amount = 3 /datum/chemical_reaction/diethylamine @@ -171,7 +170,10 @@ name = "Lexorin" id = "lexorin" result = "lexorin" - required_reagents = list(MAT_PHORON = 1, "hydrogen" = 1, "nitrogen" = 1) + required_reagents = list( + /datum/reagent/toxin/phoron = 1, + /datum/reagent/ammonia = 2, + ) result_amount = 3 /* Toxins and neutralisations */ @@ -225,8 +227,10 @@ name = "Hydrophoron" id = "hydrophoron" result = "hydrophoron" - required_reagents = list("hydrogen" = 1, MAT_PHORON = 1) - inhibitors = list("nitrogen" = 1) //So it doesn't mess with lexorin + required_reagents = list( + /datum/reagent/hydrogen = 1, + /datum/reagent/toxin/phoron = 1, + ) result_amount = 2 //Ashlander Chemistry! @@ -255,14 +259,16 @@ new /obj/item/soap/primitive(get_turf(holder.my_atom)) // todo: why is this a chemical reaction? make a chalkcrafting system or something... -/datum/chemical_reaction/charcoal_stick - name = "Charcoal Stick" - id = "charcoal-stick" - required_reagents = list("tallow" = 1, "alchemybase" = 1) -/datum/chemical_reaction/charcoal_stick/on_reaction_instant(datum/reagent_holder/holder, multiplier) - . = ..() - new /obj/item/pen/charcoal(get_turf(holder.my_atom)) +// you know what fuck you; this trips up unit tests. i'm just commenting it out. +// /datum/chemical_reaction/charcoal_stick +// name = "Charcoal Stick" +// id = "charcoal-stick" +// required_reagents = list("tallow" = 1, "alchemybase" = 1) + +// /datum/chemical_reaction/charcoal_stick/on_reaction_instant(datum/reagent_holder/holder, multiplier) +// . = ..() +// new /obj/item/pen/charcoal(get_turf(holder.my_atom)) /datum/chemical_reaction/fertilizer name = "Fertilizer"