From 8a0133678ac97ed5cc5095c9797d28b9c581df60 Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Sat, 23 Apr 2022 19:19:39 -0500 Subject: [PATCH 1/3] Update _machinery.dm --- code/game/machinery/_machinery.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 1a7990186dc2..3f9db1274213 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -484,6 +484,8 @@ Class Procs: checked_cell.charge = checked_cell.maxcharge checked_cell.explode() if(B.get_part_rating() > A.get_part_rating()) + if(istype(B,/obj/item/reagent_containers) && !isemptylist(B.reagents?.reagent_list)) + continue if(istype(B,/obj/item/stack)) //conveniently this will mean A is also a stack and I will kill the first person to prove me wrong var/obj/item/stack/SA = A var/obj/item/stack/SB = B From 15e0da4982aeeb1862a40f228abd17d82bdd610e Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Sat, 23 Apr 2022 19:25:43 -0500 Subject: [PATCH 2/3] Revert "Update _machinery.dm" This reverts commit 8a0133678ac97ed5cc5095c9797d28b9c581df60. --- code/game/machinery/_machinery.dm | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 3f9db1274213..1a7990186dc2 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -484,8 +484,6 @@ Class Procs: checked_cell.charge = checked_cell.maxcharge checked_cell.explode() if(B.get_part_rating() > A.get_part_rating()) - if(istype(B,/obj/item/reagent_containers) && !isemptylist(B.reagents?.reagent_list)) - continue if(istype(B,/obj/item/stack)) //conveniently this will mean A is also a stack and I will kill the first person to prove me wrong var/obj/item/stack/SA = A var/obj/item/stack/SB = B From 499847a81b6dde33b441dc43e3257962cfa711ca Mon Sep 17 00:00:00 2001 From: ToasterBiome Date: Sat, 23 Apr 2022 19:37:22 -0500 Subject: [PATCH 3/3] Update _machinery.dm --- code/game/machinery/_machinery.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 1a7990186dc2..e6b151c8059c 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -476,6 +476,9 @@ Class Procs: break for(var/obj/item/B in W.contents) if(istype(B, P) && istype(A, P)) + //won't replace beakers if they have reagents in them to prevent funny explosions + if(istype(B,/obj/item/reagent_containers) && !isemptylist(B.reagents?.reagent_list)) + continue // If it's a corrupt or rigged cell, attempting to send it through Bluespace could have unforeseen consequences. if(istype(B, /obj/item/stock_parts/cell) && W.works_from_distance) var/obj/item/stock_parts/cell/checked_cell = B