shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1519 from Citadel-Station-13/upstream-merge-28245

Browse Source 
[MIRROR] Fixes attacking not breaking chameleon
This commit is contained in:
LetterJay
2017-06-12 12:38:19 -05:00
committed by GitHub
parent b599a8bbfa 4276cdde17
commit a3ded857cf
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/mutations.dm
+5
View File
@@ -408,6 +408,11 @@ GLOBAL_LIST_EMPTY(mutations_list)
/datum/mutation/human/chameleon/on_move(mob/living/carbon/human/owner) /datum/mutation/human/chameleon/on_move(mob/living/carbon/human/owner)
owner.alpha = CHAMELEON_MUTATION_DEFAULT_TRANSPARENCY 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) /datum/mutation/human/chameleon/on_losing(mob/living/carbon/human/owner)
if(..()) if(..())
return return