From 9c9b2feefcbe6c7292d7ad8612758c3fba452f54 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 30 Apr 2018 14:05:01 -0400 Subject: [PATCH 1/2] Merge pull request #37510 from JJRcop/throw_myself Circuits can't throw themselves --- code/modules/integrated_electronics/subtypes/manipulation.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm index b63f3f7234..1744a468f5 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -491,7 +491,7 @@ var/target_y_rel = round(get_pin_data(IC_INPUT, 2)) var/obj/item/A = get_pin_data_as_type(IC_INPUT, 3, /obj/item) - if(!A || A.anchored || A.throwing) + if(!A || A.anchored || A.throwing || A == assembly) return if(max_w_class && (A.w_class > max_w_class))