cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Shadekin Phase Animation Size (#8267)

Browse Source
This commit is contained in:
Guti
2024-04-22 08:14:40 +02:00
committed by GitHub
parent 86c1056e21
commit c26fb422d0
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/atoms_movable.dm
View File

@@ -418,6 +418,7 @@
if(A == src) continue if(A == src) continue
if(istype(A,/mob/living)) if(istype(A,/mob/living))
if(A:lying) continue if(A:lying) continue
if(A.is_incorporeal()) continue // CHOMPEdit - For phased entities
src.throw_impact(A,speed) src.throw_impact(A,speed)
if(isobj(A)) if(isobj(A))
if(!A.density || A.throwpass) if(!A.density || A.throwpass)

4
modular_chomp/code/modules/mob/living/carbon/human/species/shadekin/shadekin_abilities.dm
View File

@@ -140,6 +140,8 @@
//Cosmetics mostly //Cosmetics mostly
var/obj/effect/temp_visual/shadekin/phase_in/phaseanim = new /obj/effect/temp_visual/shadekin/phase_in(src.loc) 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 phaseanim.dir = dir
alpha = 0 alpha = 0
custom_emote(1,"phases in!") custom_emote(1,"phases in!")
@@ -232,6 +234,8 @@
B.escapable = FALSE B.escapable = FALSE
var/obj/effect/temp_visual/shadekin/phase_out/phaseanim = new /obj/effect/temp_visual/shadekin/phase_out(src.loc) 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 phaseanim.dir = dir
alpha = 0 alpha = 0
add_modifier(/datum/modifier/shadekin_phase_vision) add_modifier(/datum/modifier/shadekin_phase_vision)