mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 11:43:31 +00:00
@@ -60,6 +60,7 @@
|
|||||||
"Nymph Chirping" = 'sound/misc/nymphchirp.ogg',
|
"Nymph Chirping" = 'sound/misc/nymphchirp.ogg',
|
||||||
"Sad Trombone" = 'sound/misc/sadtrombone.ogg',
|
"Sad Trombone" = 'sound/misc/sadtrombone.ogg',
|
||||||
"Honk" = 'sound/items/bikehorn.ogg',
|
"Honk" = 'sound/items/bikehorn.ogg',
|
||||||
|
"Bone Fracture" = "fracture",
|
||||||
)
|
)
|
||||||
var/selected_sound = null
|
var/selected_sound = null
|
||||||
|
|
||||||
|
|||||||
@@ -45,6 +45,7 @@ var/list/clown_sound = list('sound/effects/clownstep1.ogg','sound/effects/clowns
|
|||||||
var/list/swing_hit_sound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
|
var/list/swing_hit_sound = list('sound/weapons/genhit1.ogg', 'sound/weapons/genhit2.ogg', 'sound/weapons/genhit3.ogg')
|
||||||
var/list/hiss_sound = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
|
var/list/hiss_sound = list('sound/voice/hiss1.ogg','sound/voice/hiss2.ogg','sound/voice/hiss3.ogg','sound/voice/hiss4.ogg')
|
||||||
var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
|
var/list/page_sound = list('sound/effects/pageturn1.ogg', 'sound/effects/pageturn2.ogg','sound/effects/pageturn3.ogg')
|
||||||
|
var/list/fracture_sound = list('sound/effects/bonebreak1.ogg','sound/effects/bonebreak2.ogg','sound/effects/bonebreak3.ogg','sound/effects/bonebreak4.ogg')
|
||||||
//var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
|
//var/list/gun_sound = list('sound/weapons/Gunshot.ogg', 'sound/weapons/Gunshot2.ogg','sound/weapons/Gunshot3.ogg','sound/weapons/Gunshot4.ogg')
|
||||||
|
|
||||||
/proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/frequency)
|
/proc/playsound(var/atom/source, soundin, vol as num, vary, extrarange as num, falloff, var/is_global, var/frequency)
|
||||||
@@ -175,5 +176,6 @@ var/const/FALLOFF_SOUNDS = 0.5
|
|||||||
if ("swing_hit") soundin = pick(swing_hit_sound)
|
if ("swing_hit") soundin = pick(swing_hit_sound)
|
||||||
if ("hiss") soundin = pick(hiss_sound)
|
if ("hiss") soundin = pick(hiss_sound)
|
||||||
if ("pageturn") soundin = pick(page_sound)
|
if ("pageturn") soundin = pick(page_sound)
|
||||||
|
if ("fracture") soundin = pick(fracture_sound)
|
||||||
//if ("gunshot") soundin = pick(gun_sound)
|
//if ("gunshot") soundin = pick(gun_sound)
|
||||||
return soundin
|
return soundin
|
||||||
|
|||||||
@@ -1002,6 +1002,7 @@ Note that amputating the affected organ does in fact remove the infection from t
|
|||||||
if(!(species.flags & NO_PAIN))
|
if(!(species.flags & NO_PAIN))
|
||||||
owner.emote("scream")
|
owner.emote("scream")
|
||||||
|
|
||||||
|
playsound(src.loc, "fracture", 10, 1, -2)
|
||||||
status |= ORGAN_BROKEN
|
status |= ORGAN_BROKEN
|
||||||
broken_description = pick("broken","fracture","hairline fracture")
|
broken_description = pick("broken","fracture","hairline fracture")
|
||||||
|
|
||||||
|
|||||||
36
html/changelogs/Redstryker-BoneBreak.yml.yml
Normal file
36
html/changelogs/Redstryker-BoneBreak.yml.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Redstryker
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- rscadd: "Added four sounds that are randomly played when bones break. Also allows the Technomancer to play the bone break sound."
|
||||||
BIN
sound/effects/bonebreak1.ogg
Normal file
BIN
sound/effects/bonebreak1.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bonebreak2.ogg
Normal file
BIN
sound/effects/bonebreak2.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bonebreak3.ogg
Normal file
BIN
sound/effects/bonebreak3.ogg
Normal file
Binary file not shown.
BIN
sound/effects/bonebreak4.ogg
Normal file
BIN
sound/effects/bonebreak4.ogg
Normal file
Binary file not shown.
Reference in New Issue
Block a user