mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-22 04:30:44 +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:
grungussuss
@@ -35,7 +35,7 @@
|
||||
addtimer(CALLBACK(src, TYPE_PROC_REF(/atom/movable, throw_at), thrown_by, throw_range+2, throw_speed, null, TRUE), 0.1 SECONDS)
|
||||
|
||||
/obj/item/freeze_cube/proc/freeze_hit_atom(atom/movable/hit_atom)
|
||||
playsound(src, 'sound/effects/glassbr3.ogg', 50, TRUE)
|
||||
playsound(src, 'sound/effects/glass/glassbr3.ogg', 50, TRUE)
|
||||
COOLDOWN_START(src, freeze_cooldown, cooldown_time)
|
||||
if(isobj(hit_atom))
|
||||
var/obj/hit_object = hit_atom
|
||||
|
||||
@@ -153,7 +153,7 @@
|
||||
/// Type of projectile we fire
|
||||
var/projectile_type = /obj/projectile/baby_watcher_blast
|
||||
/// Sound to make when we shoot
|
||||
var/projectile_sound = 'sound/weapons/pierce.ogg'
|
||||
var/projectile_sound = 'sound/items/weapons/pierce.ogg'
|
||||
/// Time between taking potshots at goliaths
|
||||
var/fire_delay = 5 SECONDS
|
||||
/// How much faster do we shoot when avenging our parent?
|
||||
|
||||
@@ -65,7 +65,7 @@
|
||||
else
|
||||
deadmind = offeredmob.get_ghost(FALSE, TRUE)
|
||||
to_chat(deadmind, "Your body has been returned to the nest. You are being remade anew, and will awaken shortly. </br><b>Your memories will remain intact in your new body, as your soul is being salvaged</b>")
|
||||
SEND_SOUND(deadmind, sound('sound/magic/enter_blood.ogg',volume=100))
|
||||
SEND_SOUND(deadmind, sound('sound/effects/magic/enter_blood.ogg',volume=100))
|
||||
addtimer(CALLBACK(src, PROC_REF(remake_walker), offeredmob), 20 SECONDS)
|
||||
offeredmob.forceMove(src)
|
||||
return
|
||||
@@ -75,7 +75,7 @@
|
||||
else
|
||||
meat_counter++
|
||||
visible_message(span_warning("Serrated tendrils eagerly pull [offeredmob] to [src], tearing the body apart as its blood seeps over the eggs."))
|
||||
playsound(get_turf(src),'sound/magic/demon_consume.ogg', 100, TRUE)
|
||||
playsound(get_turf(src),'sound/effects/magic/demon_consume.ogg', 100, TRUE)
|
||||
var/deliverykey = offeredmob.fingerprintslast //ckey of whoever brought the body
|
||||
var/mob/living/deliverymob = get_mob_by_key(deliverykey) //mob of said ckey
|
||||
//there is a 40% chance that the Lava Lizard unlocks their respawn with each sacrifice
|
||||
@@ -103,7 +103,7 @@
|
||||
oldmob.mind.transfer_to(newwalker)
|
||||
newwalker.mind.grab_ghost()
|
||||
to_chat(newwalker, "<b>You have been pulled back from beyond the grave, with a new body and renewed purpose. Glory to the Necropolis!</b>")
|
||||
playsound(get_turf(newwalker),'sound/magic/exit_blood.ogg', 100, TRUE)
|
||||
playsound(get_turf(newwalker),'sound/effects/magic/exit_blood.ogg', 100, TRUE)
|
||||
qdel(oldmob)
|
||||
|
||||
/obj/structure/lavaland/ash_walker/proc/spawn_mob()
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
|
||||
icon_screen = "slots_screen_working"
|
||||
update_appearance()
|
||||
playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, FALSE)
|
||||
playsound(src, 'sound/machines/lavaland/cursed_slot_machine.ogg', 50, FALSE)
|
||||
addtimer(CALLBACK(src, PROC_REF(determine_victor), user), 5 SECONDS)
|
||||
|
||||
/obj/structure/cursed_slot_machine/update_overlays()
|
||||
@@ -84,11 +84,11 @@
|
||||
user.apply_status_effect(/datum/status_effect/grouped/cursed)
|
||||
|
||||
SEND_SIGNAL(user, COMSIG_CURSED_SLOT_MACHINE_LOST)
|
||||
playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE)
|
||||
playsound(src, 'sound/machines/buzz/buzz-sigh.ogg', 30, TRUE)
|
||||
balloon_alert_to_viewers("you lost!")
|
||||
return
|
||||
|
||||
playsound(src, 'sound/lavaland/cursed_slot_machine_jackpot.ogg', 50, FALSE)
|
||||
playsound(src, 'sound/machines/lavaland/cursed_slot_machine_jackpot.ogg', 50, FALSE)
|
||||
new prize(get_turf(src))
|
||||
if(user)
|
||||
to_chat(user, span_boldwarning("You've hit the jackpot!!! Laughter echoes around you as your reward appears in the machine's place."))
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
max_integrity = 5 //one tap
|
||||
|
||||
/obj/structure/fluff/balloon_nuke/atom_destruction()
|
||||
playsound(loc, 'sound/effects/cartoon_pop.ogg', 75, vary = TRUE)
|
||||
playsound(loc, 'sound/effects/cartoon_sfx/cartoon_pop.ogg', 75, vary = TRUE)
|
||||
..()
|
||||
|
||||
/obj/structure/fluff/fake_camera
|
||||
|
||||
@@ -122,7 +122,7 @@
|
||||
sight_blocker.pixel_y = initial(sight_blocker.pixel_y) - (32 * sight_blocker_distance)
|
||||
sight_blocker.forceMove(sight_blocker_turf)
|
||||
sleep(0.25 SECONDS)
|
||||
playsound(T, 'sound/magic/clockwork/invoke_general.ogg', 30, TRUE, frequency = 15000)
|
||||
playsound(T, 'sound/effects/magic/clockwork/invoke_general.ogg', 30, TRUE, frequency = 15000)
|
||||
add_overlay(door_overlay)
|
||||
open = FALSE
|
||||
else
|
||||
@@ -183,7 +183,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
|
||||
message_admins("[user ? ADMIN_LOOKUPFLW(user):"Unknown"] has released Legion!")
|
||||
user.log_message("released Legion.", LOG_GAME)
|
||||
|
||||
var/sound/legion_sound = sound('sound/creatures/legion_spawn.ogg')
|
||||
var/sound/legion_sound = sound('sound/mobs/non-humanoids/legion/legion_spawn.ogg')
|
||||
for(var/mob/M in GLOB.player_list)
|
||||
if(is_valid_z_level(get_turf(M), T))
|
||||
to_chat(M, span_userdanger("Discordant whispers flood your mind in a thousand voices. Each one speaks your name, over and over. Something horrible has been released."))
|
||||
|
||||
@@ -34,7 +34,7 @@
|
||||
force = 18
|
||||
throwforce = 10
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
hitsound = 'sound/items/weapons/bladeslice.ogg'
|
||||
|
||||
/obj/item/knife/envy/afterattack(atom/target, mob/living/carbon/human/user, click_parameters)
|
||||
if(!istype(user) || !ishuman(target))
|
||||
|
||||
@@ -117,15 +117,15 @@ GLOBAL_VAR_INIT(fscpassword, generate_password())
|
||||
/area/ruin/space/has_grav/syndicate_forgotten_ship
|
||||
name = "Syndicate Forgotten Ship"
|
||||
icon_state = "syndie-ship"
|
||||
ambientsounds = list('sound/ambience/ambidanger.ogg', 'sound/ambience/ambidanger2.ogg', 'sound/ambience/ambigen8.ogg', 'sound/ambience/ambigen9.ogg')
|
||||
ambientsounds = list('sound/ambience/misc/ambidanger.ogg', 'sound/ambience/misc/ambidanger2.ogg', 'sound/ambience/general/ambigen8.ogg', 'sound/ambience/general/ambigen9.ogg')
|
||||
|
||||
/area/ruin/space/has_grav/syndicate_forgotten_cargopod
|
||||
name = "Syndicate Forgotten Cargo pod"
|
||||
icon_state = "syndie-ship"
|
||||
ambientsounds = list('sound/ambience/ambigen3.ogg', 'sound/ambience/signal.ogg')
|
||||
ambientsounds = list('sound/ambience/general/ambigen3.ogg', 'sound/ambience/misc/signal.ogg')
|
||||
|
||||
/area/ruin/space/has_grav/powered/syndicate_forgotten_vault
|
||||
name = "Syndicate Forgotten Vault"
|
||||
icon_state = "syndie-ship"
|
||||
ambientsounds = list('sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg')
|
||||
ambientsounds = list('sound/ambience/engineering/ambitech2.ogg', 'sound/ambience/engineering/ambitech3.ogg')
|
||||
area_flags = NOTELEPORT | UNIQUE_AREA
|
||||
|
||||
@@ -327,8 +327,8 @@
|
||||
base_icon_state = "donk"
|
||||
stun_projectile = /obj/projectile/bullet/foam_dart/riot
|
||||
lethal_projectile = /obj/projectile/bullet/c9mm/blunttip
|
||||
lethal_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
|
||||
stun_projectile_sound = 'sound/weapons/gun/pistol/shot.ogg'
|
||||
lethal_projectile_sound = 'sound/items/weapons/gun/pistol/shot.ogg'
|
||||
stun_projectile_sound = 'sound/items/weapons/gun/pistol/shot.ogg'
|
||||
desc = "A ballistic machine gun auto-turret with Donk Co. branding. It uses 9mm rounds."
|
||||
armor_type = /datum/armor/donk_turret
|
||||
scan_range = 6
|
||||
@@ -353,9 +353,9 @@
|
||||
icon_state = "red_lethal"
|
||||
base_icon_state = "red"
|
||||
stun_projectile = /obj/projectile/energy/electrode
|
||||
stun_projectile_sound = 'sound/weapons/taser.ogg'
|
||||
stun_projectile_sound = 'sound/items/weapons/taser.ogg'
|
||||
lethal_projectile = /obj/projectile/beam/laser/cybersun
|
||||
lethal_projectile_sound = 'sound/weapons/lasercannonfire.ogg'
|
||||
lethal_projectile_sound = 'sound/items/weapons/lasercannonfire.ogg'
|
||||
desc = "An energy gun auto-turret with Cybersun branding. It fires high-energy plasma beams that do a lot of damage, but it can be fairly slow."
|
||||
armor_type = /datum/armor/syndicate_shuttle
|
||||
scan_range = 6
|
||||
|
||||
@@ -395,7 +395,7 @@ GLOBAL_VAR_INIT(hhMysteryRoomNumber, rand(1, 999999))
|
||||
has_gravity = TRUE
|
||||
area_flags = NOTELEPORT | HIDDEN_AREA
|
||||
static_lighting = TRUE
|
||||
ambientsounds = list('sound/ambience/servicebell.ogg')
|
||||
ambientsounds = list('sound/ambience/ruin/servicebell.ogg')
|
||||
var/roomnumber = 0
|
||||
var/obj/item/hilbertshotel/parentSphere
|
||||
var/datum/turf_reservation/reservation
|
||||
|
||||
@@ -131,7 +131,7 @@
|
||||
/obj/lightning_thrower/process(seconds_per_tick)
|
||||
var/list/dirs = throw_diagonals ? GLOB.diagonals : GLOB.cardinals
|
||||
throw_diagonals = !throw_diagonals
|
||||
playsound(src, 'sound/magic/lightningbolt.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE)
|
||||
playsound(src, 'sound/effects/magic/lightningbolt.ogg', 25, TRUE, SHORT_RANGE_SOUND_EXTRARANGE, ignore_walls = FALSE)
|
||||
for(var/direction in dirs)
|
||||
var/victim_turf = get_step(src, direction)
|
||||
if(isclosedturf(victim_turf))
|
||||
|
||||
@@ -56,7 +56,7 @@
|
||||
switch(damage_type)
|
||||
if(BRUTE)
|
||||
if(damage_amount)
|
||||
playsound(loc, 'sound/effects/attackblob.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE)
|
||||
playsound(loc, 'sound/effects/blob/attackblob.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE)
|
||||
else
|
||||
playsound(loc, 'sound/effects/meatslap.ogg', vol = 50, vary = TRUE, pressure_affected = FALSE)
|
||||
if(BURN)
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
update_appearance()
|
||||
|
||||
/obj/machinery/mod_installer/proc/play_install_sound()
|
||||
playsound(src, 'sound/items/rped.ogg', 30, FALSE)
|
||||
playsound(src, 'sound/items/tools/rped.ogg', 30, FALSE)
|
||||
|
||||
/obj/machinery/mod_installer/update_icon_state()
|
||||
icon_state = busy ? busy_icon_state : "[base_icon_state][state_open ? "_open" : null]"
|
||||
|
||||
Reference in New Issue
Block a user