cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-24 05:30:05 +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-23 22:24:50 -07: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/bitrunning/antagonists/netguardian.dm
+4 -4
View File
@@ -22,7 +22,7 @@
attack_verb_continuous = "drills"
attack_verb_simple = "drills"
attack_sound = 'sound/weapons/drill.ogg'
attack_sound = 'sound/items/weapons/drill.ogg'
attack_vis_effect = ATTACK_EFFECT_MECHFIRE
verb_say = "states"
verb_ask = "queries"
@@ -58,7 +58,7 @@
ADD_TRAIT(src, TRAIT_NO_FLOATING_ANIM, INNATE_TRAIT)
AddComponent(/datum/component/ranged_attacks, \
casing_type = /obj/item/ammo_casing/c46x30mm, \
projectile_sound = 'sound/weapons/gun/smg/shot.ogg', \
projectile_sound = 'sound/items/weapons/gun/smg/shot.ogg', \
burst_shots = 6 \
)
@@ -71,7 +71,7 @@
/mob/living/basic/netguardian/death(gibbed)
do_sparks(number = 3, cardinal_only = TRUE, source = src)
playsound(src, 'sound/mecha/weapdestr.ogg', 100)
playsound(src, 'sound/vehicles/mecha/weapdestr.ogg', 100)
return ..()
/mob/living/basic/netguardian/update_overlays()
@@ -91,7 +91,7 @@
/datum/action/cooldown/mob_cooldown/projectile_attack/rapid_fire/netguardian/Activate(atom/target_atom)
var/mob/living/player = owner
playsound(player, 'sound/mecha/skyfall_power_up.ogg', 120)
playsound(player, 'sound/vehicles/mecha/skyfall_power_up.ogg', 120)
player.say("target acquired.", "machine")
var/overlay_icon = 'icons/mob/nonhuman-player/netguardian.dmi'
code/modules/bitrunning/components/avatar_connection.dm
+5 -5
View File
@@ -69,7 +69,7 @@
for(var/skill_type in old_mind.known_skills)
avatar.mind.set_experience(skill_type, old_mind.get_skill_exp(skill_type), silent = TRUE)
avatar.playsound_local(avatar, 'sound/magic/blink.ogg', 25, TRUE)
avatar.playsound_local(avatar, 'sound/effects/magic/blink.ogg', 25, TRUE)
avatar.set_static_vision(2 SECONDS)
avatar.set_temp_blindness(1 SECONDS) // I'm in
@@ -134,7 +134,7 @@
SIGNAL_HANDLER
var/mob/living/avatar = parent
avatar.playsound_local(avatar, 'sound/machines/terminal_success.ogg', 50, vary = TRUE)
avatar.playsound_local(avatar, 'sound/machines/terminal/terminal_success.ogg', 50, vary = TRUE)
avatar.throw_alert(
ALERT_BITRUNNER_COMPLETED,
/atom/movable/screen/alert/bitrunning/qserver_domain_complete,
@@ -179,7 +179,7 @@
SIGNAL_HANDLER
var/mob/living/avatar = parent
avatar.playsound_local(avatar, 'sound/machines/terminal_alert.ogg', 50, vary = TRUE)
avatar.playsound_local(avatar, 'sound/machines/terminal/terminal_alert.ogg', 50, vary = TRUE)
var/atom/movable/screen/alert/bitrunning/alert = avatar.throw_alert(
ALERT_BITRUNNER_CROWBAR,
/atom/movable/screen/alert/bitrunning,
@@ -229,7 +229,7 @@
SIGNAL_HANDLER
var/mob/living/avatar = parent
avatar.playsound_local(avatar, 'sound/machines/terminal_alert.ogg', 50, vary = TRUE)
avatar.playsound_local(avatar, 'sound/machines/terminal/terminal_alert.ogg', 50, vary = TRUE)
var/atom/movable/screen/alert/bitrunning/alert = avatar.throw_alert(
ALERT_BITRUNNER_SHUTDOWN,
/atom/movable/screen/alert/bitrunning,
@@ -244,7 +244,7 @@
SIGNAL_HANDLER
var/mob/living/avatar = parent
avatar.playsound_local(avatar, 'sound/machines/terminal_alert.ogg', 50, vary = TRUE)
avatar.playsound_local(avatar, 'sound/machines/terminal/terminal_alert.ogg', 50, vary = TRUE)
var/atom/movable/screen/alert/bitrunning/alert = avatar.throw_alert(
ALERT_BITRUNNER_BREACH,
/atom/movable/screen/alert/bitrunning,
code/modules/bitrunning/components/bitrunning_points.dm
+1 -1
View File
@@ -28,7 +28,7 @@
/// Spawns the crate with some effects
/datum/component/bitrunning_points/proc/reveal()
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
var/turf/tile = parent
var/obj/structure/closet/crate/secure/bitrunning/encrypted/crate = new()
code/modules/bitrunning/netpod/container.dm
+4 -4
View File
@@ -17,7 +17,7 @@
/obj/machinery/netpod/open_machine(drop = TRUE, density_to_set = FALSE)
playsound(src, 'sound/machines/tramopen.ogg', 60, TRUE, frequency = 65000)
playsound(src, 'sound/machines/tram/tramopen.ogg', 60, TRUE, frequency = 65000)
flick("[base_icon_state]_opening", src)
SEND_SIGNAL(src, COMSIG_BITRUNNER_NETPOD_OPENED)
update_use_power(IDLE_POWER_USE)
@@ -29,7 +29,7 @@
if(!state_open || panel_open || !is_operational || !iscarbon(user))
return
playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
playsound(src, 'sound/machines/tram/tramclose.ogg', 60, TRUE, frequency = 65000)
flick("[base_icon_state]_closing", src)
..()
@@ -52,7 +52,7 @@
span_notice("You start to pry open [src]."),
span_notice("You hear loud prying on metal.")
)
playsound(src, 'sound/machines/airlock_alien_prying.ogg', 100, TRUE)
playsound(src, 'sound/machines/airlock/airlock_alien_prying.ogg', 100, TRUE)
SEND_SIGNAL(src, COMSIG_BITRUNNER_CROWBAR_ALERT, pryer)
@@ -67,7 +67,7 @@
/// Closes the machine without shoving in an occupant
/obj/machinery/netpod/proc/shut_pod()
state_open = FALSE
playsound(src, 'sound/machines/tramclose.ogg', 60, TRUE, frequency = 65000)
playsound(src, 'sound/machines/tram/tramclose.ogg', 60, TRUE, frequency = 65000)
flick("[base_icon_state]_closing", src)
set_density(TRUE)
code/modules/bitrunning/netpod/utils.dm
+1 -1
View File
@@ -29,7 +29,7 @@
open_machine()
return
mob_occupant.playsound_local(src, 'sound/magic/blink.ogg', 25, TRUE)
mob_occupant.playsound_local(src, 'sound/effects/magic/blink.ogg', 25, TRUE)
mob_occupant.set_static_vision(2 SECONDS)
mob_occupant.set_temp_blindness(1 SECONDS)
mob_occupant.Paralyze(2 SECONDS)
code/modules/bitrunning/objects/byteforge.dm
+1 -1
View File
@@ -26,7 +26,7 @@
/// Does some sparks after it's done
/obj/machinery/byteforge/proc/flash(atom/movable/thing)
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
var/datum/effect_system/spark_spread/quantum/sparks = new()
sparks.set_up(5, 1, loc)
code/modules/bitrunning/objects/loot_box.dm
+1 -1
View File
@@ -47,7 +47,7 @@
atom_storage.max_total_storage = 3
atom_storage.locked = STORAGE_NOT_LOCKED
icon_state = icon_closed
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
/obj/item/storage/lockbox/bitrunning/decrypted/PopulateContents()
var/choice = SSbitrunning.pick_secondary_loot(source_domain)
code/modules/bitrunning/objects/loot_crate.dm
+1 -1
View File
@@ -37,7 +37,7 @@
rewards_multiplier = 1,
)
. = ..()
playsound(src, 'sound/magic/blink.ogg', 50, TRUE)
playsound(src, 'sound/effects/magic/blink.ogg', 50, TRUE)
if(isnull(completed_domain))
return
code/modules/bitrunning/server/_parent.dm
+1 -1
View File
@@ -108,7 +108,7 @@
add_overlay(mutable_appearance('icons/obj/machines/bitrunning.dmi', "emag_overlay"))
balloon_alert(user, "system jailbroken...")
playsound(src, 'sound/effects/sparks1.ogg', 35, vary = TRUE)
playsound(src, 'sound/effects/sparks/sparks1.ogg', 35, vary = TRUE)
/obj/machinery/quantum_server/update_appearance(updates)
if(isnull(generated_domain) || !is_operational)
code/modules/bitrunning/server/loot.dm
+1 -1
View File
@@ -33,7 +33,7 @@
SEND_SIGNAL(src, COMSIG_BITRUNNER_DOMAIN_COMPLETE, cache, generated_domain.reward_points)
points += generated_domain.reward_points
playsound(src, 'sound/machines/terminal_success.ogg', 30, vary = TRUE)
playsound(src, 'sound/machines/terminal/terminal_success.ogg', 30, vary = TRUE)
var/bonus = calculate_rewards()
code/modules/bitrunning/server/map_handling.dm
+4 -4
View File
@@ -5,12 +5,12 @@
if(!length(avatar_connection_refs))
balloon_alert_to_viewers("powering down domain...")
playsound(src, 'sound/machines/terminal_off.ogg', 40, vary = TRUE)
playsound(src, 'sound/machines/terminal/terminal_off.ogg', 40, vary = TRUE)
reset()
return
balloon_alert_to_viewers("notifying clients...")
playsound(src, 'sound/machines/terminal_alert.ogg', 100, vary = TRUE)
playsound(src, 'sound/machines/terminal/terminal_alert.ogg', 100, vary = TRUE)
user.visible_message(
span_danger("[user] begins depowering the server!"),
span_notice("You start disconnecting clients..."),
@@ -43,7 +43,7 @@
return FALSE
is_ready = FALSE
playsound(src, 'sound/machines/terminal_processing.ogg', 30, 2)
playsound(src, 'sound/machines/terminal/terminal_processing.ogg', 30, 2)
/// If any one of these fail, it reverts the entire process
if(!load_domain(map_key) || !load_map_items() || !load_mob_segments())
@@ -60,7 +60,7 @@
if(prob(spawn_chance))
setup_glitch()
playsound(src, 'sound/machines/terminal_insert_disc.ogg', 30, vary = TRUE)
playsound(src, 'sound/machines/terminal/terminal_insert_disc.ogg', 30, vary = TRUE)
balloon_alert_to_viewers("domain loaded.")
generated_domain.start_time = world.time
points -= generated_domain.cost
code/modules/bitrunning/server/threats.dm
+2 -2
View File
@@ -121,7 +121,7 @@
antag_mind.special_role = ROLE_GLITCH
antag_mind.set_assigned_role(SSjob.get_job_type(/datum/job/bitrunning_glitch))
playsound(new_mob, 'sound/magic/ethereal_exit.ogg', 50, vary = TRUE)
playsound(new_mob, 'sound/effects/magic/ethereal_exit.ogg', 50, vary = TRUE)
message_admins("[ADMIN_LOOKUPFLW(new_mob)] has been made into virtual antagonist by an event.")
new_mob.log_message("was spawned as a virtual antagonist by an event.", LOG_GAME)
@@ -170,7 +170,7 @@
if(temp_body)
qdel(temp_body)
do_teleport(antag, get_turf(chosen_forge), forced = TRUE, asoundin = 'sound/magic/ethereal_enter.ogg', asoundout = 'sound/magic/ethereal_exit.ogg', channel = TELEPORT_CHANNEL_QUANTUM)
do_teleport(antag, get_turf(chosen_forge), forced = TRUE, asoundin = 'sound/effects/magic/ethereal_enter.ogg', asoundout = 'sound/effects/magic/ethereal_exit.ogg', channel = TELEPORT_CHANNEL_QUANTUM)
/// Removes any invalid candidates from the list
code/modules/bitrunning/server/util.dm
+1 -1
View File
@@ -134,7 +134,7 @@
/// Do some magic teleport sparks
/obj/machinery/quantum_server/proc/spark_at_location(obj/cache)
playsound(cache, 'sound/magic/blink.ogg', 50, vary = TRUE)
playsound(cache, 'sound/effects/magic/blink.ogg', 50, vary = TRUE)
var/datum/effect_system/spark_spread/quantum/sparks = new()
sparks.set_up(5, location = get_turf(cache))
sparks.start()