Merge pull request #3038 from Citadel-Station-13/upstream-merge-31132

[MIRROR] Fixes changelings being able to transform sting mobs that are transform sting immune
This commit is contained in:
LetterJay
2017-10-01 16:29:13 -04:00
committed by GitHub
@@ -77,10 +77,10 @@
return
..()
/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/target)
/obj/effect/proc_holder/changeling/sting/transformation/can_sting(mob/user, mob/living/carbon/target)
if(!..())
return
if((target.disabilities & HUSK) || !target.has_dna())
if((target.disabilities & HUSK) || !iscarbon(target) || (NOTRANSSTING in target.dna.species.species_traits))
to_chat(user, "<span class='warning'>Our sting appears ineffective against its DNA.</span>")
return 0
return 1