From 4276cdde174765871e8c6918ef24f85b2ccff8ba Mon Sep 17 00:00:00 2001 From: CitadelStationBot Date: Sat, 10 Jun 2017 12:19:39 -0500 Subject: [PATCH] Fixes attacking not breaking chameleon --- code/datums/mutations.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/datums/mutations.dm b/code/datums/mutations.dm index 05e4f4d458..49f709bf76 100644 --- a/code/datums/mutations.dm +++ b/code/datums/mutations.dm @@ -408,6 +408,11 @@ GLOBAL_LIST_EMPTY(mutations_list) /datum/mutation/human/chameleon/on_move(mob/living/carbon/human/owner) owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY +/datum/mutation/human/chameleon/on_attack_hand(mob/living/carbon/human/owner, atom/target, proximity) + if(proximity) //stops tk from breaking chameleon + owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY + return + /datum/mutation/human/chameleon/on_losing(mob/living/carbon/human/owner) if(..()) return