From 6ee359f52d0c7df192b2030cba6fe1fcadeab903 Mon Sep 17 00:00:00 2001 From: Fox-McCloud Date: Sat, 24 Jan 2015 22:39:12 -0500 Subject: [PATCH] Oops, forgot this. --- code/game/sound.dm | 2 ++ code/modules/mob/living/carbon/human/human_attackhand.dm | 4 ++-- code/modules/mob/living/carbon/human/human_damage.dm | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/code/game/sound.dm b/code/game/sound.dm index 8f76396ed4c..165a98d3dcd 100644 --- a/code/game/sound.dm +++ b/code/game/sound.dm @@ -2,6 +2,7 @@ var/list/shatter_sound = list('sound/effects/Glassbr1.ogg','sound/effects/Glassb var/list/explosion_sound = list('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg') var/list/spark_sound = list('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg') var/list/rustle_sound = list('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg') +var/list/bodyfall_sound = list('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg') var/list/punch_sound = list('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg') var/list/clown_sound = list('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg') var/list/jackboot_sound = list('sound/effects/jackboot1.ogg','sound/effects/jackboot2.ogg') @@ -108,6 +109,7 @@ var/const/FALLOFF_SOUNDS = 0.5 if ("explosion") soundin = pick(explosion_sound) if ("sparks") soundin = pick(spark_sound) if ("rustle") soundin = pick(rustle_sound) + if ("bodyfall") soundin = pick(bodyfall_sound) if ("punch") soundin = pick(punch_sound) if ("clownstep") soundin = pick(clown_sound) if ("jackboot") soundin = pick(jackboot_sound) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index f9080dfaafd..ed7c1c9336b 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -172,7 +172,7 @@ log_attack("[M.name] ([M.ckey]) pushed [src.name] ([src.ckey])") return - if(randn <= 45 && !lying) +/* if(randn <= 45 && !lying) if(head) var/obj/item/clothing/head/H = head if(!istype(H) || prob(H.loose)) @@ -180,7 +180,7 @@ if(prob(60)) step_away(H,M) visible_message("[M] has knocked [src]'s [H] off!", - "[M] knocked \the [H] clean off your head!") + "[M] knocked \the [H] clean off your head!") */ var/talked = 0 // BubbleWrap diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm index 17f53a6d578..86c4cc95a26 100644 --- a/code/modules/mob/living/carbon/human/human_damage.dm +++ b/code/modules/mob/living/carbon/human/human_damage.dm @@ -342,7 +342,7 @@ This function restores all organs. ..() if(forced) playsound(loc, "bodyfall", 50, 1, -1) - if(head) +/* if(head) var/multiplier = 1 if(stat || (status_flags & FAKEDEATH)) multiplier = 2 @@ -352,4 +352,4 @@ This function restores all organs. if(prob(60)) step_rand(H) if(!stat) - src << "Your [H] fell off!" + src << "Your [H] fell off!" */