Merge pull request #3034 from Citadel-Station-13/upstream-merge-31138

[MIRROR] Structure istype define
2017-10-01 16:20:56 -04:00
parent b2a01d688d 6572781b63
commit e572d2e529
10 changed files with 106 additions and 104 deletions
@@ -667,7 +667,7 @@
 						equip_to_appropriate_slot(MYID)
 		//THIEVING SKILLS END
 		//-------------TOUCH ME
-		if(istype(TARGET, /obj/structure))
+		if(isstructure(TARGET))
 			var/obj/structure/STR = TARGET
 			if(main_hand)
 				var/obj/item/W = main_hand