Merge pull request #6486 from Poojawa/4-22-sync

Hard TG Sync 4/22
2018-04-27 00:08:38 -05:00
parent 5b035581f0 132ae3a657
commit d496d78169
395 changed files with 90949 additions and 23433 deletions
@@ -817,7 +817,8 @@
 		return FALSE
 	var/ignore_bags = get_pin_data(IC_INPUT, 1)
 	if(ignore_bags)
-		if(istype(A, /obj/item/storage))
+		GET_COMPONENT_FROM(STR, /datum/component/storage, A)
+		if(STR)
 			return FALSE
 	set_pin_data(IC_OUTPUT, 1, WEAKREF(A))
 	push_data()