mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-20 04:26:03 +01:00
Reorganizes the sound folder (#86726)
## About The Pull Request <details> - renamed ai folder to announcer -- announcer -- - moved vox_fem to announcer - moved approachingTG to announcer - separated the ambience folder into ambience and instrumental -- ambience -- - created holy folder moved all related sounds there - created engineering folder and moved all related sounds there - created security folder and moved ambidet there - created general folder and moved ambigen there - created icemoon folder and moved all icebox-related ambience there - created medical folder and moved all medbay-related ambi there - created ruin folder and moves all ruins ambi there - created beach folder and moved seag and shore there - created lavaland folder and moved related ambi there - created aurora_caelus folder and placed its ambi there - created misc folder and moved the rest of the files that don't have a specific category into it -- instrumental -- - moved traitor folder here - created lobby_music folder and placed our songs there (title0 not used anywhere? - server-side modification?) -- items -- - moved secdeath to hailer - moved surgery to handling -- effects -- - moved chemistry into effects - moved hallucinations into effects - moved health into effects - moved magic into effects -- vehicles -- - moved mecha into vehicles created mobs folder -- mobs -- - moved creatures folder into mobs - moved voice into mobs renamed creatures to non-humanoids renamed voice to humanoids -- non-humanoids-- created cyborg folder created hiss folder moved harmalarm.ogg to cyborg -- humanoids -- -- misc -- moved ghostwhisper to misc moved insane_low_laugh to misc I give up trying to document this. </details> - [X] ambience - [x] announcer - [x] effects - [X] instrumental - [x] items - [x] machines - [x] misc - [X] mobs - [X] runtime - [X] vehicles - [ ] attributions ## Why It's Good For The Game This folder is so disorganized that it's vomit inducing, will make it easier to find and add new sounds, providng a minor structure to the sound folder. ## Changelog 🆑 grungussuss refactor: the sound folder in the source code has been reorganized, please report any oddities with sounds playing or not playing server: lobby music has been repathed to sound/music/lobby_music /🆑
This commit is contained in:
@@ -38,11 +38,11 @@
|
||||
/datum/instrument/fun/mothscream
|
||||
name = "Moth Scream"
|
||||
id = "mothscream"
|
||||
real_samples = list("60"='sound/voice/moth/scream_moth.ogg')
|
||||
real_samples = list("60"='sound/mobs/humanoids/moth/scream_moth.ogg')
|
||||
admin_only = TRUE
|
||||
|
||||
/datum/instrument/fun/bilehorn
|
||||
name = "Bilehorn"
|
||||
id = "bilehorn"
|
||||
real_samples = list("60"='sound/creatures/bileworm/bileworm_spit.ogg')
|
||||
real_samples = list("60"='sound/mobs/non-humanoids/bileworm/bileworm_spit.ogg')
|
||||
admin_only = TRUE
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
inhand_icon_state = "banjo"
|
||||
attack_verb_continuous = list("scruggs-styles", "hum-diggitys", "shin-digs", "clawhammers")
|
||||
attack_verb_simple = list("scruggs-style", "hum-diggity", "shin-dig", "clawhammer")
|
||||
hitsound = 'sound/weapons/banjoslap.ogg'
|
||||
hitsound = 'sound/items/weapons/banjoslap.ogg'
|
||||
allowed_instrument_ids = "banjo"
|
||||
|
||||
/obj/item/instrument/guitar
|
||||
@@ -69,7 +69,7 @@
|
||||
inhand_icon_state = "guitar"
|
||||
attack_verb_continuous = list("plays metal on", "serenades", "crashes", "smashes")
|
||||
attack_verb_simple = list("play metal on", "serenade", "crash", "smash")
|
||||
hitsound = 'sound/weapons/stringsmash.ogg'
|
||||
hitsound = 'sound/items/weapons/stringsmash.ogg'
|
||||
allowed_instrument_ids = list("guitar","csteelgt","cnylongt", "ccleangt", "cmutedgt")
|
||||
|
||||
/obj/item/instrument/eguitar
|
||||
@@ -80,7 +80,7 @@
|
||||
force = 12
|
||||
attack_verb_continuous = list("plays metal on", "shreds", "crashes", "smashes")
|
||||
attack_verb_simple = list("play metal on", "shred", "crash", "smash")
|
||||
hitsound = 'sound/weapons/stringsmash.ogg'
|
||||
hitsound = 'sound/items/weapons/stringsmash.ogg'
|
||||
allowed_instrument_ids = "eguitar"
|
||||
|
||||
/obj/item/instrument/glockenspiel
|
||||
@@ -243,6 +243,6 @@
|
||||
attack_verb_simple = list("flutter", "flap")
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
force = 0
|
||||
hitsound = 'sound/voice/moth/scream_moth.ogg'
|
||||
hitsound = 'sound/mobs/humanoids/moth/scream_moth.ogg'
|
||||
custom_price = PAYCHECK_COMMAND * 2.37
|
||||
custom_premium_price = PAYCHECK_COMMAND * 2.37
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
if(BRUTE)
|
||||
playsound(src, 'sound/effects/piano_hit.ogg', 100, TRUE)
|
||||
if(BURN)
|
||||
playsound(src, 'sound/items/welder.ogg', 100, TRUE)
|
||||
playsound(src, 'sound/items/tools/welder.ogg', 100, TRUE)
|
||||
|
||||
/obj/structure/musician/piano/atom_break(damage_flag)
|
||||
. = ..()
|
||||
|
||||
Reference in New Issue
Block a user