Merge pull request #7616 from Citadel-Station-13/kevinz000-patch-5

crushers can now apply upgrades by hitting an upgrade with it, meaning cyborgs can upgrade their crushers
2018-10-13 00:18:23 -04:00
parent 743636c22e 70428a67de
commit 766819f403
1 changed files with 3 additions and 0 deletions
@@ -73,6 +73,9 @@

 /obj/item/twohanded/required/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
 	. = ..()
+	if(istype(target, /obj/item/crusher_trophy))
+		var/obj/item/crusher_trophy/T = target
+		T.add_to(src, user)
 	if(!proximity_flag && charged)//Mark a target, or mine a tile.
 		var/turf/proj_turf = user.loc
 		if(!isturf(proj_turf))