From 57b2a3618e145571d66a6498204f1293dc273fc1 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 30 Sep 2017 23:35:45 -0300 Subject: [PATCH 1/2] Merge pull request #31132 from KorPhaeron/lingfix Fixes changelings being able to transform sting mobs that are transform sting immune --- code/game/gamemodes/changeling/powers/tiny_prick.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index ca2fd6f03e..1732e98630 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -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, "Our sting appears ineffective against its DNA.") return 0 return 1