Skip to content

Commit

Permalink
reagent container can process again
Browse files Browse the repository at this point in the history
  • Loading branch information
AlbertNanotracen committed Jun 9, 2024
1 parent 7ef1441 commit 274cac6
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 14 deletions.
7 changes: 3 additions & 4 deletions code/modules/reagents/reagent_containers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 2 additions & 7 deletions monkestation/code/modules/reagents/containers.dm
Original file line number Diff line number Diff line change
@@ -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)
4 changes: 2 additions & 2 deletions monkestation/code/modules/reagents/fun/austrialium.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion monkestation/code/modules/reagents/reagents.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 274cac6

Please sign in to comment.