Merge pull request #6597 from Citadel-Station-13/upstream-merge-37510

[MIRROR] Circuits can't throw themselves
2018-05-02 01:25:23 +00:00
parent d26ba53e91 9b6c3f5da2
commit 9c1a4303f9
1 changed files with 1 additions and 1 deletions
@@ -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))