diff --git a/code/datums/ductnet.dm b/code/datums/ductnet.dm index f81e9e608c..3ab936f6f4 100644 --- a/code/datums/ductnet.dm +++ b/code/datums/ductnet.dm @@ -6,7 +6,7 @@ var/capacity /datum/ductnet/proc/add_duct(obj/machinery/duct/D) - if(!D || D in ducts) + if(!D || (D in ducts)) return ducts += D D.duct = src @@ -57,4 +57,4 @@ var/obj/machinery/duct/D = A D.duct = null if(delete) //I don't want code to run with qdeleted objects because that can never be good, so keep this in-case the ductnet has some business left to attend to before commiting suicide - qdel(src) + qdel(src) diff --git a/code/modules/plumbing/plumbers/bottler.dm b/code/modules/plumbing/plumbers/bottler.dm index 57233a5873..396c7cac22 100644 --- a/code/modules/plumbing/plumbers/bottler.dm +++ b/code/modules/plumbing/plumbers/bottler.dm @@ -65,15 +65,15 @@ var/obj/item/reagent_containers/B = AM ///see if it would overflow else inject if((B.reagents.total_volume + wanted_amount) <= B.reagents.maximum_volume) - reagents.trans_to(B, wanted_amount, transfered_by = src) + reagents.trans_to(B, wanted_amount) B.forceMove(goodspot) return ///glass was full so we move it away AM.forceMove(badspot) if(istype(AM, /obj/item/slime_extract)) ///slime extracts need inject AM.forceMove(goodspot) - reagents.trans_to(AM, wanted_amount, transfered_by = src, method = INJECT) + reagents.trans_to(AM, wanted_amount) return if(istype(AM, /obj/item/slimecross/industrial)) ///no need to move slimecross industrial things - reagents.trans_to(AM, wanted_amount, transfered_by = src, method = INJECT) + reagents.trans_to(AM, wanted_amount) return diff --git a/code/modules/plumbing/plumbers/grinder_chemical.dm b/code/modules/plumbing/plumbers/grinder_chemical.dm index d080bd7c8f..f39c79f906 100644 --- a/code/modules/plumbing/plumbers/grinder_chemical.dm +++ b/code/modules/plumbing/plumbers/grinder_chemical.dm @@ -56,7 +56,7 @@ I.on_juice() reagents.add_reagent_list(I.juice_results) if(I.reagents) - I.reagents.trans_to(src, I.reagents.total_volume, transfered_by = src) + I.reagents.trans_to(src, I.reagents.total_volume) qdel(I) return I.on_grind()