From beb119ff0b501aa610aed9cb83c3fdbcf83342f8 Mon Sep 17 00:00:00 2001 From: BlueNothing <20761604+BlueNothing@users.noreply.github.com> Date: Thu, 21 Jun 2018 03:41:51 -0400 Subject: [PATCH] Preventing grabbers from holding other circuits is a simple (one-line) fix that strongly nerfs so-called 'uberthrower' circuits, dropping their damage output drastically. Uberthrower circuits are one of the most famous unintended uses of circuits. (#38621) --- 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 c391c629629..2d20f85aa02 100644 --- a/code/modules/integrated_electronics/subtypes/manipulation.dm +++ b/code/modules/integrated_electronics/subtypes/manipulation.dm @@ -367,7 +367,7 @@ var/atom/movable/acting_object = get_object() var/turf/T = get_turf(acting_object) var/obj/item/AM = get_pin_data_as_type(IC_INPUT, 1, /obj/item) - if(AM) + if(!QDELETED(AM) && !istype(AM, /obj/item/electronic_assembly)) var/mode = get_pin_data(IC_INPUT, 2) if(mode == 1) if(check_target(AM))