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

Oops, forgot this.

Browse Source
This commit is contained in:
Fox-McCloud
2015-01-24 22:39:12 -05:00
parent 74f51188d9
commit 6ee359f52d
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/sound.dm
+2
View File
@@ -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)
code/modules/mob/living/carbon/human/human_attackhand.dm
+2 -2
View File
@@ -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("<span class='warning'>[M] has knocked [src]'s [H] off!</span>",
"<span class='warning'>[M] knocked \the [H] clean off your head!</span>")
"<span class='warning'>[M] knocked \the [H] clean off your head!</span>") */
var/talked = 0 // BubbleWrap
code/modules/mob/living/carbon/human/human_damage.dm
+2 -2
View File
@@ -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 << "<span class='warning'>Your [H] fell off!</span>"
src << "<span class='warning'>Your [H] fell off!</span>" */