From 274cac6748ddfd0e16d3400de37fc364c0081a90 Mon Sep 17 00:00:00 2001 From: AlbertNanotracen Date: Sat, 8 Jun 2024 21:21:58 -0300 Subject: [PATCH] reagent container can process again --- code/modules/reagents/reagent_containers.dm | 7 +++---- monkestation/code/modules/reagents/containers.dm | 9 ++------- monkestation/code/modules/reagents/fun/austrialium.dm | 4 ++-- monkestation/code/modules/reagents/reagents.dm | 2 +- 4 files changed, 8 insertions(+), 14 deletions(-) diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm index e6e2a12406b1..64fe40e246ff 100644 --- a/code/modules/reagents/reagent_containers.dm +++ b/code/modules/reagents/reagent_containers.dm @@ -317,10 +317,9 @@ SIGNAL_HANDLER update_appearance() - if(reasses_processing()) - START_PROCESSING(SSobj, src) - else if(datum_flags & DF_ISPROCESSING) - STOP_PROCESSING(SSobj, src) + //Monkestation Addition: For Australium + reagent_processing() + //End Monkestation Addition return NONE diff --git a/monkestation/code/modules/reagents/containers.dm b/monkestation/code/modules/reagents/containers.dm index 5c710869d488..924ace5822da 100644 --- a/monkestation/code/modules/reagents/containers.dm +++ b/monkestation/code/modules/reagents/containers.dm @@ -1,9 +1,4 @@ -/obj/item/reagent_containers/proc/reasses_processing() +/obj/item/reagent_containers/proc/reagent_processing() for(var/datum/reagent/listed_reagent in reagents.reagent_list) if(listed_reagent.requires_process) - return TRUE - -/obj/item/reagent_containers/process(seconds_per_tick) - . = ..() - for(var/datum/reagent/listed_reagent in reagents.reagent_list) - listed_reagent.on_container_process(src) + listed_reagent.reagent_fire(src) diff --git a/monkestation/code/modules/reagents/fun/austrialium.dm b/monkestation/code/modules/reagents/fun/austrialium.dm index db7440187eb3..7e86612fc10d 100644 --- a/monkestation/code/modules/reagents/fun/austrialium.dm +++ b/monkestation/code/modules/reagents/fun/austrialium.dm @@ -18,9 +18,9 @@ m180.Turn(180) animate(L, transform = m180, time = 3) -/datum/reagent/australium/on_container_process(obj/item/reagent_containers/host) +/datum/reagent/australium/reagent_fire(obj/item/reagent_containers/host) for(var/datum/reagent/listed_reagent in host.reagents.reagent_list) - if(listed_reagent.inverse_chem != /datum/reagent/inverse) + if(!(isnull(listed_reagent.inverse_chem) || listed_reagent.inverse_chem == /datum/reagent/inverse )) var/listed_volume = listed_reagent.volume var/datum/reagent/inverse_reagent = listed_reagent.inverse_chem host.reagents.remove_reagent(listed_reagent.type, listed_volume) diff --git a/monkestation/code/modules/reagents/reagents.dm b/monkestation/code/modules/reagents/reagents.dm index 6ae647d41fde..5351b75f9e0b 100644 --- a/monkestation/code/modules/reagents/reagents.dm +++ b/monkestation/code/modules/reagents/reagents.dm @@ -3,5 +3,5 @@ var/requires_process = FALSE ///called whenever a reagent container processes its internal chemicals -/datum/reagent/proc/on_container_process(obj/item/reagent_containers/host) +/datum/reagent/proc/reagent_fire(obj/item/reagent_containers/host) return