From c26fb422d0b204ceb802bcd7ef268b517dc858db Mon Sep 17 00:00:00 2001 From: Guti <32563288+TheCaramelion@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:14:40 +0200 Subject: [PATCH] Shadekin Phase Animation Size (#8267) --- code/game/atoms_movable.dm | 1 + .../carbon/human/species/shadekin/shadekin_abilities.dm | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index a7e9884e54..31a7e13e63 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -418,6 +418,7 @@ if(A == src) continue if(istype(A,/mob/living)) if(A:lying) continue + if(A.is_incorporeal()) continue // CHOMPEdit - For phased entities src.throw_impact(A,speed) if(isobj(A)) if(!A.density || A.throwpass) diff --git a/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm b/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm index c9e48b27e2..4c0523f2d8 100644 --- a/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm +++ b/modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm @@ -140,6 +140,8 @@ //Cosmetics mostly var/obj/effect/temp_visual/shadekin/phase_in/phaseanim = new /obj/effect/temp_visual/shadekin/phase_in(src.loc) + phaseanim.pixel_y = (src.size_multiplier - 1) * 16 // Pixel shift for the animation placement + phaseanim.adjust_scale(src.size_multiplier, src.size_multiplier) phaseanim.dir = dir alpha = 0 custom_emote(1,"phases in!") @@ -232,6 +234,8 @@ B.escapable = FALSE var/obj/effect/temp_visual/shadekin/phase_out/phaseanim = new /obj/effect/temp_visual/shadekin/phase_out(src.loc) + phaseanim.pixel_y = (src.size_multiplier - 1) * 16 // Pixel shift for the animation placement + phaseanim.adjust_scale(src.size_multiplier, src.size_multiplier) phaseanim.dir = dir alpha = 0 add_modifier(/datum/modifier/shadekin_phase_vision)