mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +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:
@@ -75,7 +75,7 @@
|
||||
switch(action)
|
||||
if("createBounty")
|
||||
if(!current_user || !bounty_text)
|
||||
playsound(src, 'sound/machines/buzz-sigh.ogg', 20, TRUE)
|
||||
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
|
||||
return TRUE
|
||||
for(var/datum/station_request/i in GLOB.request_list)
|
||||
if("[i.req_number]" == "[current_user.account_id]")
|
||||
@@ -92,14 +92,14 @@
|
||||
computer.say("Please swipe a valid ID first.")
|
||||
return TRUE
|
||||
if(current_user.account_holder == active_request.owner)
|
||||
playsound(computer, 'sound/machines/buzz-sigh.ogg', 20, TRUE)
|
||||
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
|
||||
return TRUE
|
||||
active_request.applicants += list(current_user)
|
||||
if("payApplicant")
|
||||
if(!current_user)
|
||||
return
|
||||
if(!current_user.has_money(active_request.value) || (current_user.account_holder != active_request.owner))
|
||||
playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
|
||||
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
|
||||
return
|
||||
request_target.transfer_money(current_user, active_request.value, "Bounties: Request Completed")
|
||||
computer.say("Paid out [active_request.value] credits.")
|
||||
@@ -112,10 +112,10 @@
|
||||
return TRUE
|
||||
if("deleteRequest")
|
||||
if(!current_user)
|
||||
playsound(computer, 'sound/machines/buzz-sigh.ogg', 20, TRUE)
|
||||
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
|
||||
return TRUE
|
||||
if(active_request.owner != current_user.account_holder)
|
||||
playsound(computer, 'sound/machines/buzz-sigh.ogg', 20, TRUE)
|
||||
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 20, TRUE)
|
||||
return TRUE
|
||||
computer.say("Deleted current request.")
|
||||
GLOB.request_list.Remove(active_request)
|
||||
|
||||
Reference in New Issue
Block a user