Skip to content

Commit

Permalink
Fix AoE flash not applying stamina damage (#408)
Browse files Browse the repository at this point in the history
  • Loading branch information
Kapu1178 authored Jul 8, 2023
1 parent 6682749 commit 5fc6756
Showing 1 changed file with 5 additions and 4 deletions.
9 changes: 5 additions & 4 deletions code/modules/assembly/flash.dm
Original file line number Diff line number Diff line change
Expand Up @@ -174,14 +174,14 @@
terrible_conversion_proc(flashed, user)
visible_message(span_danger("[user] blinds [flashed] with the flash!"), span_userdanger("[user] blinds you with the flash!"))
//easy way to make sure that you can only long stun someone who is facing in your direction
flashed.Disorient((7 SECONDS * (1-(deviation*0.5))), 70, paralyze = 4 SECONDS)
flashed.Disorient((7 SECONDS * (1-(deviation*0.5))), 90 * (1-(deviation*0.5)), paralyze = 4 SECONDS)
else if(user)
visible_message(span_warning("[user] fails to blind [flashed] with the flash!"), span_danger("[user] fails to blind you with the flash!"))
else
to_chat(flashed, span_danger("[src] fails to blind you!"))

else
flashed.Disorient(7 SECONDS * (1-(deviation*0.5)), paralyze = 4 SECONDS)
flashed.Disorient(7 SECONDS * (1-(deviation*0.5)), 90 * (1-(deviation*0.5)), paralyze = 4 SECONDS)

/**
* Handles the directionality of the attack
Expand Down Expand Up @@ -255,8 +255,9 @@
/obj/item/assembly/flash/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
if(holder)
return FALSE
if(!AOE_flash(user = user))
return FALSE
if(AOE_flash(user = user))
user.changeNext_move(CLICK_CD_MELEE)


/obj/item/assembly/flash/emp_act(severity)
. = ..()
Expand Down

0 comments on commit 5fc6756

Please sign in to comment.