Merge pull request #29871

This commit is contained in:
Jordan Brown
2017-08-14 17:00:10 -04:00
@@ -113,6 +113,7 @@
return 0
/obj/item/weapon/melee/transforming/energy/sword/cyborg
item_color = "red"
var/hitcost = 50
/obj/item/weapon/melee/transforming/energy/sword/cyborg/attack(mob/M, var/mob/living/silicon/robot/R)