mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-24 13:38:41 +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:
@@ -209,7 +209,7 @@
|
||||
moving = FALSE
|
||||
starting_turf = null
|
||||
say(message)
|
||||
playsound(src,'sound/machines/synth_no.ogg',50,FALSE)
|
||||
playsound(src,'sound/machines/synth/synth_no.ogg',50,FALSE)
|
||||
STOP_PROCESSING(SSfastprocess, src)
|
||||
|
||||
/**
|
||||
@@ -221,7 +221,7 @@
|
||||
moving = TRUE
|
||||
starting_turf = get_turf(src)
|
||||
say("Beginning training simulation.")
|
||||
playsound(src,'sound/machines/triple_beep.ogg',50,FALSE)
|
||||
playsound(src,'sound/machines/beep/triple_beep.ogg',50,FALSE)
|
||||
START_PROCESSING(SSfastprocess, src)
|
||||
|
||||
/**
|
||||
@@ -285,7 +285,7 @@
|
||||
do_attack_animation(target, null, attached_item)
|
||||
if (obj_flags & EMAGGED)
|
||||
target.apply_damage(attached_item.force, BRUTE, BODY_ZONE_CHEST, attacking_item = attached_item)
|
||||
playsound(src, 'sound/weapons/smash.ogg', 15, TRUE)
|
||||
playsound(src, 'sound/items/weapons/smash.ogg', 15, TRUE)
|
||||
COOLDOWN_START(src, attack_cooldown, rand(MIN_ATTACK_DELAY, MAX_ATTACK_DELAY))
|
||||
|
||||
/**
|
||||
@@ -390,9 +390,9 @@
|
||||
return FALSE
|
||||
total_hits++
|
||||
lap_hits++
|
||||
playsound(src,'sound/weapons/smash.ogg',50,FALSE)
|
||||
playsound(src,'sound/items/weapons/smash.ogg',50,FALSE)
|
||||
if (lap_hits % HITS_TO_KILL == 0)
|
||||
playsound(src,'sound/machines/twobeep.ogg',25,FALSE)
|
||||
playsound(src,'sound/machines/beep/twobeep.ogg',25,FALSE)
|
||||
return TRUE
|
||||
|
||||
/obj/item/training_toolbox/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
|
||||
|
||||
Reference in New Issue
Block a user