Merge branch 'master' into upstream-merge-37476

2018-05-06 07:07:02 +00:00
parent 892cb0a1be 11c1e8fbf7
commit 6a07a66cb3
738 changed files with 10463 additions and 18840 deletions
@@ -173,7 +173,7 @@
 	possible_colors = list("purple" = LIGHT_COLOR_LAVENDER)

 /obj/item/melee/transforming/energy/sword/saber/attackby(obj/item/W, mob/living/user, params)
-	if(istype(W, /obj/item/device/multitool))
+	if(istype(W, /obj/item/multitool))
 		if(!hacked)
 			hacked = TRUE
 			item_color = "rainbow"