cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds sounds to falling over

Browse Source 
Resting and buckling are still silent.

Conflicts:
	code/modules/mob/living/carbon/human/human_damage.dm
This commit is contained in:
Tenebrosity
2014-01-24 00:01:15 -05:00
committed by ZomgPonies
parent d01ef41eac
commit f6603faa52
6 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/sound.dm
+1
View File
@@ -68,6 +68,7 @@ var/const/SURROUND_CAP = 7
if ("explosion") soundin = pick('sound/effects/Explosion1.ogg','sound/effects/Explosion2.ogg')
if ("sparks") soundin = pick('sound/effects/sparks1.ogg','sound/effects/sparks2.ogg','sound/effects/sparks3.ogg','sound/effects/sparks4.ogg')
if ("rustle") soundin = pick('sound/effects/rustle1.ogg','sound/effects/rustle2.ogg','sound/effects/rustle3.ogg','sound/effects/rustle4.ogg','sound/effects/rustle5.ogg')
if ("bodyfall") soundin = pick('sound/effects/bodyfall1.ogg','sound/effects/bodyfall2.ogg','sound/effects/bodyfall3.ogg','sound/effects/bodyfall4.ogg')
if ("punch") soundin = pick('sound/weapons/punch1.ogg','sound/weapons/punch2.ogg','sound/weapons/punch3.ogg','sound/weapons/punch4.ogg')
if ("clownstep") soundin = pick('sound/effects/clownstep1.ogg','sound/effects/clownstep2.ogg')
if ("jackboot") soundin = pick('sound/effects/jackboot1.ogg','sound/effects/jackboot2.ogg')
code/modules/mob/living/carbon/human/human_damage.dm
+9 -1
View File
@@ -64,6 +64,7 @@
if(M_HULK in mutations) return
..()
/mob/living/carbon/human/adjustCloneLoss(var/amount)
..()
var/heal_prob = max(0, 80 - getCloneLoss())
@@ -92,6 +93,13 @@
if (O.status & ORGAN_MUTATED)
O.unmutate()
src << "<span class = 'notice'>Your [O.display_name] is shaped normally again.</span>"
/mob/living/carbon/human/update_canmove()
var/old_lying = lying
. = ..()
if(lying && !old_lying && !resting && !buckled) // fell down
playsound(loc, "bodyfall", 50, 1, -1)
////////////////////////////////////////////
//Returns a list of damaged organs
@@ -259,4 +267,4 @@
organ.implants += S
visible_message("<span class='danger'>The projectile sticks in the wound!</span>")
S.add_blood(src)
return 1
return 1