cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Adds new push sounds, makes all punch sounds use the proper one in sound.dm (#9675)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-08-24 20:04:38 +08:00
committed by GitHub
parent 1a8940bbd8
commit 772d1f3d5c
16 changed files with 65 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/modules/mob/living/carbon/human/human_attackhand.dm
View File

@@ -410,7 +410,7 @@
if(randn <= 25)
if(H.gloves && istype(H.gloves,/obj/item/clothing/gloves/force))
apply_effect(6, WEAKEN, run_armor_check(affecting, "melee"))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1)
visible_message("<span class='danger'>[M] hurls [src] to the floor!</span>")
step_away(src,M,15)
sleep(3)
@@ -420,16 +420,17 @@
else
var/armor_check = run_armor_check(affecting, "melee")
apply_effect(3, WEAKEN, armor_check)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
if(armor_check < 100)
visible_message("<span class='danger'>[M] has pushed [src]!</span>")
playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1)
else
visible_message("<span class='warning'>[M] attempted to push [src]!</span>")
playsound(loc, 'sound/weapons/push.ogg', 50, 1, -1)
return
if(randn <= 60)
if(H.gloves && istype(H.gloves,/obj/item/clothing/gloves/force))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1)
visible_message("<span class='danger'>[M] shoves, sending [src] flying!</span>")
step_away(src,M,15)
sleep(1)

2
code/modules/mob/living/carbon/human/species/species_attack.dm
View File

@@ -126,7 +126,7 @@
/datum/unarmed_attack/terminator/apply_effects(var/mob/living/carbon/human/user,var/mob/living/carbon/human/target,var/armor,var/attack_damage,var/zone)
..()
if(prob(25) && target.mob_size <= 30)
playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(user, 'sound/weapons/push_connect.ogg', 50, 1, -1)
user.visible_message("<span class='danger'>[user] shoves hard, sending [target] flying!</span>")
var/T = get_turf(user)
spark(T, 3, alldirs)

2
code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm
View File

@@ -82,7 +82,7 @@
melee_damage_lower = 0
melee_damage_upper = 0
attacktext = "barrels into"
attack_sound = 'sound/weapons/punch1.ogg'
attack_sound = "punch"
a_intent = I_HURT
speak_emote = list("chirps","buzzes","whirrs")
emote_hear = list("chirps cheerfully","buzzes","whirrs","hums placidly","chirps","hums")

4
code/modules/mob/mob_grab_specials.dm
View File

@@ -121,7 +121,7 @@
to_chat(attacker, "<span class='warning'>You require a better grab to do this.</span>")
return
if(target.grab_joint(attacker, target_zone))
playsound(loc, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)
playsound(loc, 'sound/weapons/push_connect.ogg', 50, 1, -1)
return
/obj/item/grab/proc/pin_down(mob/target, mob/attacker)
@@ -197,4 +197,4 @@
else
visible_message("<span class='danger'>[assailant] violently tugs [target]'s [hairchatname]!</span>")
target.apply_damage(15, PAIN)
src.state = GRAB_AGGRESSIVE
src.state = GRAB_AGGRESSIVE