Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
silicons committed Oct 26, 2024
1 parent 26adb84 commit 27a2934
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 16 deletions.
5 changes: 0 additions & 5 deletions code/__HELPERS/reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
28 changes: 17 additions & 11 deletions code/modules/reagents/chemistry/reactions/Misc-Recipes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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!
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit 27a2934

Please sign in to comment.