Merge branch 'master' into upstream-merge-29690

2017-08-15 19:18:22 -05:00
parent 41c9cf3a4a 67194ef0db
commit 0ffaf66d1f
186 changed files with 3316 additions and 1264 deletions
@@ -44,7 +44,8 @@

 		qdel(src)
 		return
-	if((istype(W, /obj/item/weapon/weldingtool) && W:welding))
+	var/obj/item/weapon/weldingtool/WT = W
+	if((istype(WT) && WT.welding))
 		if(!status)
 			status = TRUE
 			GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"