Merge pull request #11315 from farie82/Species-transformation-fix

Fixes species transformations not retaining items correctly
This commit is contained in:
variableundefined
2019-05-07 16:56:21 +08:00
committed by GitHub
2 changed files with 5 additions and 11 deletions
@@ -132,15 +132,6 @@
throw_range = 0
throw_speed = 0
/obj/item/melee/arm_blade/New()
..()
if(ismob(loc))
loc.visible_message("<span class='warning'>A grotesque blade forms around [loc.name]\'s arm!</span>", "<span class='warning'>Our arm twists and mutates, transforming it into a deadly blade.</span>", "<span class='warning'>You hear organic matter ripping and tearing!</span>")
/obj/item/melee/arm_blade/dropped(mob/user)
user.visible_message("<span class='warning'>With a sickening crunch, [user] reforms [user.p_their()] blade into an arm!</span>", "<span class='notice'>We assimilate the blade back into our body.</span>", "<span class='warning'>You hear organic matter ripping and tearing!</span>")
. = ..()
/obj/item/melee/arm_blade/afterattack(atom/target, mob/user, proximity)
if(!proximity)
return