Skip to content

Commit

Permalink
[s] Fixes Nukie modsuit combat defibs not subtracting charge on harm …
Browse files Browse the repository at this point in the history
…mode (#22186)

* Fixes the oopsie daisy

* Fixes another oopsie daisy
  • Loading branch information
DGamerL authored Aug 31, 2023
1 parent 6bf9bb9 commit fd46ed6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion code/datums/components/defibrillator.dm
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@

if(should_cause_harm)
fibrillate(user, target)
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, TRUE)
return

user.visible_message(
Expand Down Expand Up @@ -300,7 +301,6 @@

target.med_hud_set_health()
target.med_hud_set_status()
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, TRUE)
add_attack_logs(user, target, "Revived with [defib_ref]")
SSblackbox.record_feedback("tally", "players_revived", 1, "defibrillator")
SEND_SIGNAL(parent, COMSIG_DEFIB_SHOCK_APPLIED, user, target, should_cause_harm, defib_success)
Expand Down

0 comments on commit fd46ed6

Please sign in to comment.