cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix shock sounds (#20457)

Browse Source
This commit is contained in:
Luc
2023-02-27 11:01:32 -06: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)
code/modules/clothing/gloves/misc_gloves.dm
+1 -1
View File
@@ -119,7 +119,7 @@
var/mob/living/carbon/C = A
if(cell.use(stun_cost))
do_sparks(5, 0, loc)
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
H.do_attack_animation(C)
visible_message("<span class='danger'>[C] has been touched with [src] by [H]!</span>")
add_attack_logs(H, C, "Touched with stun gloves")
code/modules/hallucinations/effects/moderate.dm
+1 -1
View File
@@ -349,7 +349,7 @@
turfs += T
var/turf/T = pick(turfs)
target.playsound_local(T, 'sound/weapons/Egloves.ogg', 25, TRUE)
target.playsound_local(T, 'sound/weapons/egloves.ogg', 25, TRUE)
target.playsound_local(T, get_sfx("bodyfall"), 25, TRUE)
target.playsound_local(T, "sparks", 50, TRUE)
code/modules/mob/living/simple_animal/bot/ed209bot.dm
+1 -1
View File
@@ -569,7 +569,7 @@
shootAt(A)
/mob/living/simple_animal/bot/ed209/proc/stun_attack(mob/living/carbon/C)
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
icon_state = "[lasercolor]ed209-c"
addtimer(VARSET_CALLBACK(src, icon_state, "[lasercolor]ed209[on]"), 2)
var/threat = C.assess_threat(src)
code/modules/mob/living/simple_animal/bot/secbot.dm
+1 -1
View File
@@ -254,7 +254,7 @@
back_to_idle()
/mob/living/simple_animal/bot/secbot/proc/stun_attack(mob/living/carbon/C)
playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
if(harmbaton)
playsound(loc, 'sound/weapons/genhit1.ogg', 50, 1, -1)
do_attack_animation(C)