cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-12 08:36:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reorganizes the sound folder (#86726)

Browse Source 
## 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:
grungussuss
2024-09-24 08:24:50 +03:00
committed by GitHub
parent 8c494a4736
commit 58501dce77
3639 changed files with 5089 additions and 5093 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/antagonist/contractor_program.dm
+4 -4
View File
@@ -54,7 +54,7 @@
if(!traitor_data.uplink_handler.contractor_hub)
traitor_data.uplink_handler.contractor_hub = new
traitor_data.uplink_handler.contractor_hub.create_contracts(traitor_user.owner)
user.playsound_local(user, 'sound/effects/contractstartup.ogg', 100, FALSE)
user.playsound_local(user, 'sound/music/antag/contractstartup.ogg', 100, FALSE)
program_open_overlay = "contractor-contractlist"
return TRUE
@@ -66,10 +66,10 @@
program_open_overlay = "contractor-extracted"
else
user.playsound_local(user, 'sound/machines/uplinkerror.ogg', 50)
user.playsound_local(user, 'sound/machines/uplink/uplinkerror.ogg', 50)
error = "Either both you or your target aren't at the dropoff location, or the pod hasn't got a valid place to land. Clear space, or make sure you're both inside."
else
user.playsound_local(user, 'sound/machines/uplinkerror.ogg', 50)
user.playsound_local(user, 'sound/machines/uplink/uplinkerror.ogg', 50)
error = "Already extracting... Place the target into the pod. If the pod was destroyed, this contract is no longer possible."
return TRUE
@@ -96,7 +96,7 @@
traitor_data.uplink_handler.contractor_hub.contract_TC_to_redeem = 0
return TRUE
else
user.playsound_local(user, 'sound/machines/uplinkerror.ogg', 50)
user.playsound_local(user, 'sound/machines/uplink/uplinkerror.ogg', 50)
return TRUE
if ("PRG_clear_error")
error = ""
code/modules/modular_computers/file_system/programs/arcade.dm
+8 -8
View File
@@ -42,7 +42,7 @@
user?.mind?.adjust_experience(/datum/skill/gaming, 1)
if(boss_hp <= 0)
heads_up = "You have crushed [boss_name]! Rejoice!"
playsound(computer.loc, 'sound/arcade/win.ogg', 50)
playsound(computer.loc, 'sound/machines/arcade/win.ogg', 50)
game_active = FALSE
program_open_overlay = "arcade_off"
if(istype(computer))
@@ -53,7 +53,7 @@
sleep(1 SECONDS)
else if(player_hp <= 0 || player_mp <= 0)
heads_up = "You have been defeated... how will the station survive?"
playsound(computer.loc, 'sound/arcade/lose.ogg', 50)
playsound(computer.loc, 'sound/machines/arcade/lose.ogg', 50)
game_active = FALSE
program_open_overlay = "arcade_off"
if(istype(computer))
@@ -74,17 +74,17 @@
return
if (boss_mp <= 5)
heads_up = "[boss_mpamt] magic power has been stolen from you!"
playsound(computer.loc, 'sound/arcade/steal.ogg', 50, TRUE)
playsound(computer.loc, 'sound/machines/arcade/steal.ogg', 50, TRUE)
player_mp -= boss_mpamt
boss_mp += boss_mpamt
else if(boss_mp > 5 && boss_hp <12)
heads_up = "[boss_name] heals for [bossheal] health!"
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE)
playsound(computer.loc, 'sound/machines/arcade/heal.ogg', 50, TRUE)
boss_hp += bossheal
boss_mp -= boss_mpamt
else
heads_up = "[boss_name] attacks you for [boss_attackamt] damage!"
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE)
playsound(computer.loc, 'sound/machines/arcade/hit.ogg', 50, TRUE)
player_hp -= boss_attackamt
pause_state = FALSE
@@ -122,7 +122,7 @@
attackamt = rand(2,6) + rand(0, gamerSkill)
pause_state = TRUE
heads_up = "You attack for [attackamt] damage."
playsound(computer.loc, 'sound/arcade/hit.ogg', 50, TRUE)
playsound(computer.loc, 'sound/machines/arcade/hit.ogg', 50, TRUE)
boss_hp -= attackamt
sleep(1 SECONDS)
game_check()
@@ -139,7 +139,7 @@
healcost = rand(1, maxPointCost)
pause_state = TRUE
heads_up = "You heal for [healamt] damage."
playsound(computer.loc, 'sound/arcade/heal.ogg', 50, TRUE)
playsound(computer.loc, 'sound/machines/arcade/heal.ogg', 50, TRUE)
player_hp += healamt
player_mp -= healcost
sleep(1 SECONDS)
@@ -152,7 +152,7 @@
rechargeamt = rand(4,7) + rand(0, gamerSkill)
pause_state = TRUE
heads_up = "You regain [rechargeamt] magic power."
playsound(computer.loc, 'sound/arcade/mana.ogg', 50, TRUE)
playsound(computer.loc, 'sound/machines/arcade/mana.ogg', 50, TRUE)
player_mp += rechargeamt
sleep(1 SECONDS)
game_check()
code/modules/modular_computers/file_system/programs/borg_monitor.dm
+2 -2
View File
@@ -139,10 +139,10 @@
if(user)
to_chat(user, "Message sent to [robot]: [message]")
robot.logevent("Message from [ID] -- \"[message]\"")
SEND_SOUND(robot, 'sound/machines/twobeep_high.ogg')
SEND_SOUND(robot, 'sound/machines/beep/twobeep_high.ogg')
if(robot.connected_ai)
to_chat(robot.connected_ai, "<br><br>[span_notice("Message from [ID] to [robot] -- \"[message]\"")]<br>")
SEND_SOUND(robot.connected_ai, 'sound/machines/twobeep_high.ogg')
SEND_SOUND(robot.connected_ai, 'sound/machines/beep/twobeep_high.ogg')
user?.log_talk(message, LOG_PDA, tag = "Cyborg Monitor Program: ID name \"[ID]\" to [robot]")
return TRUE
code/modules/modular_computers/file_system/programs/bounty_board.dm
+5 -5
View File
@@ -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)
code/modules/modular_computers/file_system/programs/budgetordering.dm
+2 -2
View File
@@ -245,12 +245,12 @@
return
if(pack.goody && !self_paid)
playsound(computer, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
computer.say("ERROR: Small crates may only be purchased by private accounts.")
return
if(SSshuttle.supply.get_order_count(pack) == OVER_ORDER_LIMIT)
playsound(computer, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
computer.say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once")
return
code/modules/modular_computers/file_system/programs/card.dm
+5 -5
View File
@@ -95,16 +95,16 @@
// Log in.
if("PRG_authenticate")
if(!computer || !inserted_auth_card)
playsound(computer, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_prompt_deny.ogg', 50, FALSE)
return TRUE
if(authenticate(user, inserted_auth_card))
playsound(computer, 'sound/machines/terminal_on.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_on.ogg', 50, FALSE)
return TRUE
// Log out.
if("PRG_logout")
authenticated_card = null
authenticated_user = null
playsound(computer, 'sound/machines/terminal_off.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_off.ogg', 50, FALSE)
return TRUE
// Print a report.
if("PRG_print")
@@ -129,7 +129,7 @@
to_chat(usr, span_notice("Printer is out of paper."))
return TRUE
else
playsound(computer, 'sound/machines/terminal_on.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_on.ogg', 50, FALSE)
computer.visible_message(span_notice("\The [computer] prints out a paper."))
return TRUE
if("PRG_eject_id")
@@ -153,7 +153,7 @@
inserted_auth_card.assignment = is_centcom ? "Fired" : "Demoted"
SSid_access.remove_trim_from_card(inserted_auth_card)
playsound(computer, 'sound/machines/terminal_prompt_deny.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_prompt_deny.ogg', 50, FALSE)
return TRUE
// Change ID card assigned name.
if("PRG_edit")
code/modules/modular_computers/file_system/programs/cargoship.dm
+1 -1
View File
@@ -36,7 +36,7 @@
computer.RemoveID(usr)
if("selectid")
if(!computer.computer_id_slot.registered_account)
playsound(get_turf(computer.ui_host()), 'sound/machines/buzz-sigh.ogg', 50, TRUE, -1)
playsound(get_turf(computer.ui_host()), 'sound/machines/buzz/buzz-sigh.ogg', 50, TRUE, -1)
return TRUE
payments_acc = computer.computer_id_slot.registered_account
playsound(get_turf(computer.ui_host()), 'sound/machines/ping.ogg', 50, TRUE, -1)
code/modules/modular_computers/file_system/programs/dept_order.dm
+4 -4
View File
@@ -156,7 +156,7 @@
var/new_dept_type = find_department_to_link(computer.computer_id_slot)
if(isnull(new_dept_type))
computer.physical.balloon_alert(orderer, "no department found!")
playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
else
computer.physical.balloon_alert(orderer, "linked")
playsound(computer, 'sound/machines/ping.ogg', 30, TRUE)
@@ -171,7 +171,7 @@
if(length(use_access & id_card_access) <= 0)
computer.physical.balloon_alert(orderer, "access denied!")
playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
return TRUE
if(action == "override_order")
@@ -179,7 +179,7 @@
return TRUE
if(length(download_access & id_card_access) <= 0)
computer.physical.balloon_alert(orderer, "requires head of staff access!")
playsound(computer, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
return TRUE
department_cooldowns[linked_department] = 0
@@ -222,7 +222,7 @@
break
if(SSshuttle.supply.get_order_count(pack) == OVER_ORDER_LIMIT)
playsound(computer, 'sound/machines/buzz-sigh.ogg', 50, FALSE)
playsound(computer, 'sound/machines/buzz/buzz-sigh.ogg', 50, FALSE)
computer.physical.say("ERROR: No more then [CARGO_MAX_ORDER] of any pack may be ordered at once!")
return
code/modules/modular_computers/file_system/programs/file_browser.dm
+2 -2
View File
@@ -35,7 +35,7 @@
return
var/newname = reject_bad_name(params["new_name"])
if(!newname || newname != params["new_name"])
playsound(computer, 'sound/machines/terminal_error.ogg', 25, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 25, FALSE)
return
file.filename = newname
return TRUE
@@ -47,7 +47,7 @@
return
var/newname = reject_bad_name(params["new_name"])
if(!newname || newname != params["new_name"])
playsound(computer, 'sound/machines/terminal_error.ogg', 25, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 25, FALSE)
return
file.filename = newname
return TRUE
code/modules/modular_computers/file_system/programs/frontier.dm
+2 -2
View File
@@ -222,7 +222,7 @@
computer.say("Purchase succesful.")
playsound(computer, 'sound/machines/ping.ogg', 25)
return TRUE
playsound(computer, 'sound/machines/terminal_error.ogg', 25)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 25)
return TRUE
/// Publication and adding points.
@@ -235,5 +235,5 @@
SStgui.update_uis(src)
playsound(computer, 'sound/machines/ping.ogg', 25)
return TRUE
playsound(computer, 'sound/machines/terminal_error.ogg', 25)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 25)
return FALSE
code/modules/modular_computers/file_system/programs/jobmanagement.dm
+3 -3
View File
@@ -70,7 +70,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
j.total_positions++
opened_positions[edit_job_target]++
log_job_debug("[key_name(usr)] opened a [j.title] job position, for a total of [j.total_positions] open job slots.")
playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE)
return TRUE
if("PRG_close_job")
var/edit_job_target = params["target"]
@@ -83,7 +83,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
j.total_positions--
opened_positions[edit_job_target]--
log_job_debug("[key_name(usr)] closed a [j.title] job position, leaving [j.total_positions] open job slots.")
playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE)
return TRUE
if("PRG_priority")
var/priority_target = params["target"]
@@ -99,7 +99,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
SSjob.prioritized_jobs += j
else
computer.say("Error: CentCom employment protocols restrict prioritising more than 5 jobs.")
playsound(computer, 'sound/machines/terminal_prompt_confirm.ogg', 50, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_prompt_confirm.ogg', 50, FALSE)
return TRUE
code/modules/modular_computers/file_system/programs/messenger/messenger_program.dm
+2 -2
View File
@@ -589,7 +589,7 @@
if(sender)
to_chat(sender, span_notice("ERROR: Network unavailable, please try again later."))
if(alert_able && !alert_silenced)
playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 15, TRUE)
return FALSE
// used for logging
@@ -620,7 +620,7 @@
if(sender)
to_chat(sender, span_notice("ERROR: Server is not responding."))
if(alert_able && !alert_silenced)
playsound(computer, 'sound/machines/terminal_error.ogg', 15, TRUE)
playsound(computer, 'sound/machines/terminal/terminal_error.ogg', 15, TRUE)
return FALSE
var/shell_addendum = ""
code/modules/modular_computers/file_system/programs/portrait_printer.dm
+1 -1
View File
@@ -96,6 +96,6 @@
printed_canvas.no_save = TRUE
printed_canvas.update_icon()
to_chat(usr, span_notice("You have printed [chosen_portrait.title] onto a new canvas."))
playsound(computer.physical, 'sound/items/poster_being_created.ogg', 100, TRUE)
playsound(computer.physical, 'sound/items/poster/poster_being_created.ogg', 100, TRUE)
#undef CANVAS_PAPER_COST
code/modules/modular_computers/file_system/programs/robocontrol.dm
+2 -2
View File
@@ -122,7 +122,7 @@
GLOB.manifest.modify(id_card.registered_name, id_card.assignment, id_card.get_trim_assignment())
computer.RemoveID(usr)
else
playsound(get_turf(computer.ui_host()) , 'sound/machines/buzz-sigh.ogg', 25, FALSE)
playsound(get_turf(computer.ui_host()) , 'sound/machines/buzz/buzz-sigh.ogg', 25, FALSE)
if("changedroneaccess")
if(!computer || !computer.computer_id_slot || !id_card)
to_chat(current_user, span_notice("No ID found, authorization failed."))
@@ -143,4 +143,4 @@
var/msg = span_boldnotice("NON-DRONE PING: [current_user.name]: [params["ping_type"]] priority alert in [current_area.name]!")
_alert_drones(msg, TRUE, current_user)
to_chat(current_user, msg)
playsound(src, 'sound/machines/terminal_success.ogg', 15, TRUE)
playsound(src, 'sound/machines/terminal/terminal_success.ogg', 15, TRUE)
code/modules/modular_computers/file_system/programs/robotact.dm
+1 -1
View File
@@ -111,7 +111,7 @@
if(!cyborg.cell || !cyborg.cell.charge)
cyborg.visible_message(span_notice("The power warning light on [span_name("[cyborg]")] flashes urgently."), \
"You announce you are operating in low power mode.")
playsound(cyborg, 'sound/machines/buzz-two.ogg', 50, FALSE)
playsound(cyborg, 'sound/machines/buzz/buzz-two.ogg', 50, FALSE)
if("toggleSensors")
cyborg.toggle_sensors()
code/modules/modular_computers/file_system/programs/secureye.dm
+1 -1
View File
@@ -198,7 +198,7 @@
camera_ref = null
last_camera_turf = null
if(!spying)
playsound(computer, 'sound/machines/terminal_off.ogg', 25, FALSE)
playsound(computer, 'sound/machines/terminal/terminal_off.ogg', 25, FALSE)
/datum/computer_file/program/secureye/proc/update_active_camera_screen()
var/obj/machinery/camera/active_camera = camera_ref?.resolve()
code/modules/modular_computers/file_system/programs/virtual_pet.dm
+4 -4
View File
@@ -310,7 +310,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
level++
grant_level_abilities()
pet.ai_controller?.set_blackboard_key(BB_VIRTUAL_PET_LEVEL, level)
playsound(computer.loc, 'sound/items/orbie_level_up.ogg', 50)
playsound(computer.loc, 'sound/mobs/non-humanoids/orbie/orbie_level_up.ogg', 50)
to_next_level += (level**2) + 500
SEND_SIGNAL(pet, COMSIG_VIRTUAL_PET_LEVEL_UP, level) //its a signal so different path types of virtual pets can handle leveling up differently
announce_global_updates(message = "has reached level [level]!")
@@ -341,7 +341,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
GLOB.global_pet_updates.Cut(1,2)
GLOB.global_pet_updates += list(message_to_announce)
playsound(computer.loc, 'sound/items/orbie_notification_sound.ogg', 50)
playsound(computer.loc, 'sound/mobs/non-humanoids/orbie/orbie_notification_sound.ogg', 50)
/datum/computer_file/program/virtual_pet/proc/remove_pet(datum/source)
SIGNAL_HANDLER
@@ -560,7 +560,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
if(!isnull(trick_name))
pet.ai_controller.set_blackboard_key(BB_TRICK_NAME, trick_name)
pet.ai_controller.override_blackboard_key(BB_TRICK_SEQUENCE, trick_sequence)
playsound(computer.loc, 'sound/items/orbie_trick_learned.ogg', 50)
playsound(computer.loc, 'sound/mobs/non-humanoids/orbie/orbie_trick_learned.ogg', 50)
return TRUE
@@ -598,7 +598,7 @@ GLOBAL_LIST_EMPTY(virtual_pets_list)
pet.befriend(our_user) //befriend whoever set us out
animate(pet, transform = matrix(), time = 1.5 SECONDS)
pet.forceMove(final_turf)
playsound(computer.loc, 'sound/items/orbie_send_out.ogg', 20)
playsound(computer.loc, 'sound/mobs/non-humanoids/orbie/orbie_send_out.ogg', 20)
new /obj/effect/temp_visual/guardian/phase(pet.loc)
#undef PET_MAX_LEVEL