cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01: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 14:04:38 +02: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
code/modules/hallucinations/types/basic.dm
+5 -5
View File
@@ -360,20 +360,20 @@
attacker_candidates -= attacker
if(prob(50))
to_chat(holder, SPAN_DANGER("[attacker] has hit [holder]!"))
sound_to(holder, pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))
sound_to(holder, "punch")
else
to_chat(holder, SPAN_DANGER("[attacker] attempted to shove [holder]!"))
sound_to(holder, 'sound/weapons/thudswoosh.ogg')
sound_to(holder, 'sound/weapons/push.ogg')
//If we are hallucinating particularly hard and there's another person adjacent to us, we imagine they attack us, too.
if(holder.hallucination >= 70 && attacker_candidates.len)
attacker = pick(attacker_candidates)
if(prob(50))
to_chat(holder, SPAN_DANGER("[attacker] has hit [holder]!"))
sound_to(holder, pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg'))
sound_to(holder, "punch")
else
to_chat(holder, SPAN_DANGER("[attacker] attempted to shove [holder]!"))
sound_to(holder, 'sound/weapons/thudswoosh.ogg')
sound_to(holder, 'sound/weapons/push.ogg')
/////////////////////////////////////////////
@@ -495,4 +495,4 @@
var/list/whisper_candidates = list("A familiar voice", "A distant voice", "A child's voice", "Something inside your head", "Your own voice", "A ghastly voice")
to_chat(holder, "<B>[pick(whisper_candidates)]</B> whispers directly into your mind, <I>\"[pick(SShallucinations.hallucinated_phrases)]\"</I>")
sound_to(holder, pick('sound/hallucinations/behind_you1.ogg', 'sound/hallucinations/behind_you2.ogg', 'sound/hallucinations/i_see_you1.ogg', 'sound/hallucinations/i_see_you2.ogg', 'sound/hallucinations/turn_around1.ogg', 'sound/hallucinations/turn_around2.ogg'))
holder.emote("shiver")
holder.emote("shiver")
code/modules/martial_arts/martial.dm
+2 -2
View File
@@ -161,7 +161,7 @@
if(!A)
break
A.set_dir(i)
playsound(A.loc, 'sound/weapons/punch1.ogg', 15, 1, -1)
playsound(A.loc, "punch", 15, 1, -1)
/obj/item/martial_manual
name = "SolCom manual"
@@ -186,4 +186,4 @@
var/weapon = pick(F.possible_weapons)
var/obj/item/W = new weapon(get_turf(user))
H.put_in_hands(W)
qdel(src)
qdel(src)
code/modules/martial_arts/plasma_fist.dm
+1 -1
View File
@@ -59,7 +59,7 @@
/datum/martial_art/plasma_fist/proc/Throwback(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
D.visible_message("<span class='danger'>[A] has hit [D] with plasma punch!</span>", \
"<span class='danger'>[A] has hit [D] with plasma punch!</span>")
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(D.loc, "punch", 50, 1, -1)
var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
D.throw_at(throw_target, 200, 4,A)
A.say("Plasma punch!")
code/modules/martial_arts/sleeping_carp.dm
+4 -4
View File
@@ -52,7 +52,7 @@
D.visible_message("<span class='warning'>[A] kicks [D] in the back!</span>")
step_to(D,get_step(D,D.dir),1)
D.Weaken(4)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(get_turf(D), "punch", 50, 1, -1)
return 1
return basic_hit(A,D)
@@ -66,7 +66,7 @@
if (!(D.species.flags & NO_BREATHE))
D.losebreath += 3
D.Stun(2)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(get_turf(D), "punch", 50, 1, -1)
return 1
return basic_hit(A,D)
@@ -78,7 +78,7 @@
"<span class='danger'>[A] kicks you in the jaw!</span>")
D.apply_damage(20, BRUTE, BP_HEAD)
D.drop_item()
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(get_turf(D), "punch", 50, 1, -1)
D.Stun(4)
return 1
@@ -91,7 +91,7 @@
if(D.stat)
D.death() //FINISH HIM!
D.apply_damage(50, BRUTE, BP_CHEST)
playsound(get_turf(D), 'sound/weapons/punch1.ogg', 75, 1, -1)
playsound(get_turf(D), "punch", 75, 1, -1)
return 1
return basic_hit(A,D)
code/modules/martial_arts/sol_combat.dm
+1 -1
View File
@@ -34,7 +34,7 @@
/datum/martial_art/sol_combat/proc/quick_choke(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)//is actually lung punch
A.do_attack_animation(D)
A.visible_message("<span class='warning'>[A] pounds [D] on the chest!</span>")
playsound(get_turf(A), 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(get_turf(A), "punch", 50, 1, -1)
if(!(D.species.flags & NO_BREATHE))
D.losebreath += 5
D.adjustOxyLoss(10)
code/modules/martial_arts/unathi.dm
+1 -1
View File
@@ -83,7 +83,7 @@
/datum/martial_art/kis_khan/proc/hammering_strike(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
A.do_attack_animation(D)
A.visible_message("<span class='danger'>[A] slams [D] away!</span>")
playsound(D.loc, 'sound/weapons/punch1.ogg', 50, 1, -1)
playsound(D.loc, "punch", 50, 1, -1)
D.apply_effect(2, WEAKEN)
var/atom/throw_target = get_edge_target_turf(D, get_dir(D, get_step_away(D, A)))
D.throw_at(throw_target, 200, 4,A)
code/modules/mob/living/carbon/human/human_attackhand.dm
+4 -3
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)
code/modules/mob/living/carbon/human/species/species_attack.dm
+1 -1
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)
code/modules/mob/living/simple_animal/hostile/retaliate/cavern.dm
+1 -1
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")
code/modules/mob/mob_grab_specials.dm
+2 -2
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