cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 03:55:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shock sounds (#20457)

Browse Source
This commit is contained in:
Luc
2023-02-27 12:01:32 -05:00
committed by GitHub
parent 79d8f54125
commit 90fbfb8d0c
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/handheld_defib.dm
+2 -2
View File
@@ -45,7 +45,7 @@
user.visible_message("<span class='danger'>[user] violently shocks [H] with [src]!</span>", "<span class='danger'>You violently shock [H] with [src]!</span>")
add_attack_logs(user, H, "emag-defibbed with [src]")
playsound(user.loc, "sound/weapons/Egloves.ogg", 75, 1)
playsound(user.loc, "sound/weapons/egloves.ogg", 75, 1)
H.KnockDown(knockdown_duration)
H.adjustStaminaLoss(60)
SEND_SIGNAL(H, COMSIG_LIVING_MINOR_SHOCK, 100)
@@ -60,7 +60,7 @@
if((H.health <= HEALTH_THRESHOLD_CRIT) || (H.undergoing_cardiac_arrest()))
user.visible_message("<span class='notice'>[user] shocks [H] with [src].</span>", "<span class='notice'>You shock [H] with [src].</span>")
add_attack_logs(user, H, "defibrillated with [src]")
playsound(user.loc, "sound/weapons/Egloves.ogg", 75, 1)
playsound(user.loc, "sound/weapons/egloves.ogg", 75, 1)
if(H.stat == DEAD)
to_chat(user, "<span class='danger'>[H] doesn't respond at all!</span>")
code/game/objects/items/weapons/implants/implant_freedom.dm
+1 -1
View File
@@ -23,7 +23,7 @@
M.apply_damage(2, BURN, "l_hand", M.run_armor_check("l_hand", "energy"))
C_imp_in.SetStunned(0) //This only triggers if they are grabbed, to have them break out of the grab, without the large stun time.
C_imp_in.SetWeakened(0)
playsound(C_imp_in.loc, "sound/weapons/Egloves.ogg", 75, 1)
playsound(C_imp_in.loc, "sound/weapons/egloves.ogg", 75, 1)
if(!uses)
qdel(src)