Skip to content

Commit

Permalink
Attack effects no longer can apply to entire Areas directly (#9886)
Browse files Browse the repository at this point in the history
* BYOE - Bring Your Own Effects

* Now with 100% less area
  • Loading branch information
HowToLoLu authored Sep 29, 2023
1 parent 312667a commit c826292
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions code/game/atoms_movable.dm
Original file line number Diff line number Diff line change
Expand Up @@ -856,12 +856,12 @@
var/obj/effect/icon/temp/attack_animation_object
if(visual_effect_icon)
I = image('icons/effects/effects.dmi', A, visual_effect_icon, A.layer + 0.1)
attack_animation_object = new(A.loc, I, 10)
attack_animation_object = new(get_turf(A), I, 10) //A.loc is an area when A is a turf
else if(used_item)
I = image(icon = used_item, loc = A, layer = A.layer + 0.1)
I.plane = GAME_PLANE
I.appearance_flags = NO_CLIENT_COLOR | PIXEL_SCALE
attack_animation_object = new(A.loc, I, 10)
attack_animation_object = new(get_turf(A), I, 10)

// Scale the icon.
attack_animation_object.transform *= pick(0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55)
Expand Down
6 changes: 3 additions & 3 deletions code/modules/antagonists/swarmer/swarmer.dm
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,7 @@
if(resource_gain)
resources += resource_gain
add_to_total_resources_eaten(resource_gain)
do_attack_animation(target)
do_attack_animation(target, no_effect = TRUE)
changeNext_move(CLICK_CD_MELEE)
var/obj/effect/temp_visual/swarmer/integrate/I = new /obj/effect/temp_visual/swarmer/integrate(get_turf(target))
I.pixel_x = target.pixel_x
Expand All @@ -469,7 +469,7 @@

/mob/living/simple_animal/hostile/swarmer/proc/DisIntegrate(atom/movable/target)
new /obj/effect/temp_visual/swarmer/disintegration(get_turf(target))
do_attack_animation(target)
do_attack_animation(target, no_effect = TRUE)
changeNext_move(CLICK_CD_MELEE)
SSexplosions.low_mov_atom += target

Expand Down Expand Up @@ -512,7 +512,7 @@
return ..()

/mob/living/simple_animal/hostile/swarmer/proc/DismantleMachine(obj/machinery/target)
do_attack_animation(target)
do_attack_animation(target, no_effect = TRUE)
to_chat(src, "<span class='info'>We begin to dismantle this machine. We will need to be uninterrupted.</span>")
var/obj/effect/temp_visual/swarmer/dismantle/D = new /obj/effect/temp_visual/swarmer/dismantle(get_turf(target))
D.pixel_x = target.pixel_x
Expand Down

0 comments on commit c826292

Please sign in to comment.