mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 05:30:05 +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:
@@ -47,26 +47,26 @@
|
||||
|
||||
/obj/item/circuit_component/soundemitter/populate_options()
|
||||
var/static/component_options = list(
|
||||
"Buzz" = 'sound/machines/buzz-sigh.ogg',
|
||||
"Buzz Twice" = 'sound/machines/buzz-two.ogg',
|
||||
"Buzz" = 'sound/machines/buzz/buzz-sigh.ogg',
|
||||
"Buzz Twice" = 'sound/machines/buzz/buzz-two.ogg',
|
||||
"Chime" = 'sound/machines/chime.ogg',
|
||||
"Honk" = 'sound/items/bikehorn.ogg',
|
||||
"Ping" = 'sound/machines/ping.ogg',
|
||||
"Sad Trombone" = 'sound/misc/sadtrombone.ogg',
|
||||
"Warn" = 'sound/machines/warning-buzzer.ogg',
|
||||
"Slow Clap" = 'sound/machines/slowclap.ogg',
|
||||
"Moth Buzz" = 'sound/voice/moth/scream_moth.ogg',
|
||||
"Squeak" = 'sound/items/toysqueak1.ogg',
|
||||
"Rip" = 'sound/items/poster_ripped.ogg',
|
||||
"Moth Buzz" = 'sound/mobs/humanoids/moth/scream_moth.ogg',
|
||||
"Squeak" = 'sound/items/toy_squeak/toysqueak1.ogg',
|
||||
"Rip" = 'sound/items/poster/poster_ripped.ogg',
|
||||
"Coinflip" = 'sound/items/coinflip.ogg',
|
||||
"Megaphone" = 'sound/items/megaphone.ogg',
|
||||
"Warpwhistle" = 'sound/magic/warpwhistle.ogg',
|
||||
"Hiss" = 'sound/voice/hiss1.ogg',
|
||||
"Lizard" = 'sound/voice/lizard/lizard_scream_1.ogg',
|
||||
"Flashbang" = 'sound/weapons/flashbang.ogg',
|
||||
"Flash" = 'sound/weapons/flash.ogg',
|
||||
"Whip" = 'sound/weapons/whip.ogg',
|
||||
"Laugh Track" = 'sound/items/SitcomLaugh1.ogg',
|
||||
"Warpwhistle" = 'sound/effects/magic/warpwhistle.ogg',
|
||||
"Hiss" = 'sound/mobs/non-humanoids/hiss/hiss1.ogg',
|
||||
"Lizard" = 'sound/mobs/humanoids/lizard/lizard_scream_1.ogg',
|
||||
"Flashbang" = 'sound/items/weapons/flashbang.ogg',
|
||||
"Flash" = 'sound/items/weapons/flash.ogg',
|
||||
"Whip" = 'sound/items/weapons/whip.ogg',
|
||||
"Laugh Track" = 'sound/items/sitcom_laugh/sitcomLaugh1.ogg',
|
||||
"Gavel" = 'sound/items/gavel.ogg',
|
||||
)
|
||||
sound_file = add_option_port("Sound Option", component_options)
|
||||
|
||||
@@ -45,7 +45,7 @@
|
||||
RegisterSignal(marked_atom, COMSIG_QDELETING, PROC_REF(cleanup_marked_atom))
|
||||
update_icon()
|
||||
flick("multitool_circuit_flick", src)
|
||||
playsound(src.loc, 'sound/misc/compiler-stage2.ogg', 30, TRUE)
|
||||
playsound(src.loc, 'sound/machines/compiler/compiler-stage2.ogg', 30, TRUE)
|
||||
return TRUE
|
||||
|
||||
/// Allow users to mark items equipped by the target that are visible.
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
CRASH("Producers of COMSIG_USB_CABLE_CONNECTED_TO_CIRCUIT must set attached_circuit")
|
||||
balloon_alert(user, "connected to circuit\nconnect to a port")
|
||||
|
||||
playsound(src, 'sound/machines/pda_button1.ogg', 20, TRUE)
|
||||
playsound(src, 'sound/machines/pda_button/pda_button1.ogg', 20, TRUE)
|
||||
|
||||
if (last_attached_circuit != attached_circuit)
|
||||
if (!isnull(last_attached_circuit))
|
||||
@@ -73,7 +73,7 @@
|
||||
connection_description = "machine"
|
||||
|
||||
balloon_alert(user, "connected to [connection_description]")
|
||||
playsound(src, 'sound/items/screwdriver2.ogg', 20, TRUE)
|
||||
playsound(src, 'sound/items/tools/screwdriver2.ogg', 20, TRUE)
|
||||
|
||||
return TRUE
|
||||
|
||||
|
||||
@@ -460,7 +460,7 @@
|
||||
var/obj/item/organ/internal/cyberimp/bci/bci_organ = carbon_occupant.get_organ_by_type(/obj/item/organ/internal/cyberimp/bci)
|
||||
if (isnull(bci_organ) && isnull(bci_to_implant))
|
||||
say("No brain-computer interface inserted, and occupant does not have one. Insert a BCI to implant one.")
|
||||
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
|
||||
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
|
||||
return FALSE
|
||||
|
||||
addtimer(CALLBACK(src, PROC_REF(start_process)), 1 SECONDS)
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
projectile_type = /obj/projectile/energy/wiremod_gun
|
||||
harmful = FALSE
|
||||
select_name = "circuit"
|
||||
fire_sound = 'sound/weapons/blaster.ogg'
|
||||
fire_sound = 'sound/items/weapons/blaster.ogg'
|
||||
|
||||
/obj/projectile/energy/wiremod_gun
|
||||
name = "scanning beam"
|
||||
|
||||
Reference in New Issue
Block a user