Skip to content

Commit

Permalink
Repaths some sounds in the sound/effects folder. (#16266)
Browse files Browse the repository at this point in the history
  • Loading branch information
Helg2 authored Jul 6, 2024
1 parent 0445470 commit bc70859
Show file tree
Hide file tree
Showing 116 changed files with 96 additions and 96 deletions.
16 changes: 8 additions & 8 deletions code/datums/cinematic.dm
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ GLOBAL_LIST_EMPTY(cinematics)
flick("intro_nuke", screen)
sleep(runtime)
flick("station_explode_fade_red", screen)
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "summary_nukewin"

Expand All @@ -141,7 +141,7 @@ GLOBAL_LIST_EMPTY(cinematics)
/datum/cinematic/nuke_miss/content()
flick("intro_nuke", screen)
sleep(runtime)
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
flick("station_intact_fade_red", screen)
screen.icon_state = "summary_nukefail"
Expand All @@ -156,7 +156,7 @@ GLOBAL_LIST_EMPTY(cinematics)
flick("intro_nuke", screen)
sleep(runtime)
flick("station_explode_fade_red", screen)
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "summary_selfdes"

Expand All @@ -169,7 +169,7 @@ GLOBAL_LIST_EMPTY(cinematics)
/datum/cinematic/nuke_selfdestruct_miss/content()
flick("intro_nuke", screen)
sleep(runtime)
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "station_intact"

Expand All @@ -183,7 +183,7 @@ GLOBAL_LIST_EMPTY(cinematics)
flick("intro_malf", screen)
sleep(runtime)
flick("station_explode_fade_red", screen)
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "summary_malf"

Expand All @@ -197,7 +197,7 @@ GLOBAL_LIST_EMPTY(cinematics)
flick("intro_nuke", screen)
sleep(runtime)
flick("station_explode_fade_red", screen)
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "summary_totala"

Expand Down Expand Up @@ -235,7 +235,7 @@ GLOBAL_LIST_EMPTY(cinematics)


/datum/cinematic/nuke_far/content()
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()


Expand All @@ -251,6 +251,6 @@ GLOBAL_LIST_EMPTY(cinematics)
flick("intro_nuke", screen) // 3.5 seconds
sleep(5.5 SECONDS)
flick("planet_nuke", screen) // About 1.5 seconds length
cinematic_sound(sound('sound/effects/explosionfar.ogg', channel = CHANNEL_CINEMATIC))
cinematic_sound(sound('sound/effects/explosion/far.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "planet_end"
2 changes: 1 addition & 1 deletion code/datums/looping_sounds/xeno_sounds.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/datum/looping_sound/zero_form_beam
mid_sounds = list(
'sound/effects/king_beam_active.ogg'=1,
'sound/effects/alien/king_beam_active.ogg'=1,
)
mid_length = 16
volume = 60
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
SEND_SIGNAL(movable_to_move, COMSIG_MOVABLE_PATROL_DEPLOYED, TRUE, 1.5, 2)
if(ismecha(movable_to_move) || isarmoredvehicle(movable_to_move))
new /obj/effect/temp_visual/rappel_dust(loc, 3)
playsound(loc, 'sound/effects/behemoth/behemoth_stomp.ogg', 40, TRUE)
playsound(loc, 'sound/effects/alien/behemoth/stomp.ogg', 40, TRUE)
for(var/user in mobs_moving)
shake_camera(user, 0.2 SECONDS, 0.5)

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/cocoon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon_state = "xeno_cocoon"
density = FALSE
layer = BELOW_OBJ_LAYER
hit_sound = 'sound/effects/alien_resin_break2.ogg'
hit_sound = 'sound/effects/alien/resin_break2.ogg'
max_integrity = 400
anchored = TRUE
obj_flags = CAN_BE_HIT
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/loot_box.dm
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@
if(picked)
picked.mind.transfer_to(new_xeno, TRUE)
to_chat(new_xeno, span_xenoannounce("The Queen Mother has hurled us through Bluespace, we live for the hive!"))
new_xeno << sound('sound/effects/xeno_newlarva.ogg')
new_xeno << sound('sound/effects/alien/new_larva.ogg')
return INITIALIZE_HINT_QDEL

//The actual drop sets
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/radio/headset.dm
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ GLOBAL_LIST_INIT(channel_tokens, list(
///Explodes the headset if you put on an enemy's headset
/obj/item/radio/headset/mainship/proc/safety_protocol(mob/living/carbon/human/user)
balloon_alert_to_viewers("Explodes")
playsound(user, 'sound/effects/explosion_micro1.ogg', 50, 1)
playsound(user, 'sound/effects/explosion/micro1.ogg', 50, 1)
if(wearer)
wearer.ex_act(EXPLODE_LIGHT)
qdel(src)
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/swords.dm
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
RegisterSignal(carbon_owner, COMSIG_MOVABLE_POST_THROW, PROC_REF(charge_complete))

carbon_owner.visible_message(span_danger("[carbon_owner] charges towards \the [A]!"))
playsound(owner, "sound/effects/alien_tail_swipe2.ogg", 50, 0, 4)
playsound(owner, 'sound/effects/alien/tail_swipe2.ogg', 50, 0, 4)
carbon_owner.throw_at(A, 2, 1, carbon_owner)
succeed_activate()
add_cooldown()
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/weapons/twohanded.dm
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@
carbon_owner.Move(get_step_towards(carbon_owner, A), get_dir(src, A))
carbon_owner.face_atom(A)
activate_particles(owner.dir)
playsound(owner, "sound/effects/alien_tail_swipe3.ogg", 50, 0, 5)
playsound(owner, 'sound/effects/alien/tail_swipe3.ogg', 50, 0, 5)
owner.visible_message(span_danger("[owner] Swing their weapon in a deadly arc!"))

var/list/atom/movable/atoms_to_ravage = get_step(owner, owner.dir).contents.Copy()
Expand Down
32 changes: 16 additions & 16 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,17 +199,17 @@ A good representation is: 'byond applies a volume reduction to the sound every X
if(SFX_SHATTER)
soundin = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg')
if(SFX_EXPLOSION_LARGE)
soundin = pick('sound/effects/explosion_large1.ogg','sound/effects/explosion_large2.ogg','sound/effects/explosion_large3.ogg','sound/effects/explosion_large4.ogg','sound/effects/explosion_large5.ogg','sound/effects/explosion_large6.ogg')
soundin = pick('sound/effects/explosion/large1.ogg','sound/effects/explosion/large2.ogg','sound/effects/explosion/large3.ogg','sound/effects/explosion/large4.ogg','sound/effects/explosion/large5.ogg','sound/effects/explosion/large6.ogg')
if(SFX_EXPLOSION_MICRO)
soundin = pick('sound/effects/explosion_micro1.ogg','sound/effects/explosion_micro2.ogg','sound/effects/explosion_micro3.ogg')
soundin = pick('sound/effects/explosion/micro1.ogg','sound/effects/explosion/micro2.ogg','sound/effects/explosion/micro3.ogg')
if(SFX_EXPLOSION_SMALL)
soundin = pick('sound/effects/explosion_small1.ogg','sound/effects/explosion_small2.ogg','sound/effects/explosion_small3.ogg','sound/effects/explosion_small4.ogg')
soundin = pick('sound/effects/explosion/small1.ogg','sound/effects/explosion/small2.ogg','sound/effects/explosion/small3.ogg','sound/effects/explosion/small4.ogg')
if(SFX_EXPLOSION_MED)
soundin = pick('sound/effects/explosion_med1.ogg','sound/effects/explosion_med2.ogg','sound/effects/explosion_med3.ogg','sound/effects/explosion_med4.ogg','sound/effects/explosion_med5.ogg','sound/effects/explosion_med6.ogg')
soundin = pick('sound/effects/explosion/medium1.ogg','sound/effects/explosion/medium2.ogg','sound/effects/explosion/medium3.ogg','sound/effects/explosion/medium4.ogg','sound/effects/explosion/medium5.ogg','sound/effects/explosion/medium6.ogg')
if(SFX_EXPLOSION_SMALL_DISTANT)
soundin = pick('sound/effects/explosion_smallfar1.ogg','sound/effects/explosion_smallfar2.ogg','sound/effects/explosion_smallfar3.ogg','sound/effects/explosion_smallfar4.ogg')
soundin = pick('sound/effects/explosion/small_far1.ogg','sound/effects/explosion/small_far2.ogg','sound/effects/explosion/small_far3.ogg','sound/effects/explosion/small_far4.ogg')
if(SFX_EXPLOSION_LARGE_DISTANT)
soundin = pick('sound/effects/explosion_far1.ogg','sound/effects/explosion_far2.ogg','sound/effects/explosion_far3.ogg','sound/effects/explosion_far4.ogg','sound/effects/explosion_far5.ogg')
soundin = pick('sound/effects/explosion/far1.ogg','sound/effects/explosion/far2.ogg','sound/effects/explosion/far3.ogg','sound/effects/explosion/far4.ogg','sound/effects/explosion/far5.ogg')
if(SFX_EXPLOSION_CREAK)
soundin = pick('sound/effects/creak1.ogg','sound/effects/creak2.ogg')
if(SFX_SPARKS)
Expand Down Expand Up @@ -300,23 +300,23 @@ A good representation is: 'byond applies a volume reduction to the sound every X
if(SFX_ALIEN_TAIL_ATTACK)
soundin = 'sound/weapons/alien_tail_attack.ogg'
if(SFX_ALIEN_FOOTSTEP_LARGE)
soundin = pick('sound/effects/alien_footstep_large1.ogg','sound/effects/alien_footstep_large2.ogg','sound/effects/alien_footstep_large3.ogg')
soundin = pick('sound/effects/alien/footstep_large1.ogg','sound/effects/alien/footstep_large2.ogg','sound/effects/alien/footstep_large3.ogg')
if(SFX_ALIEN_CHARGE)
soundin = pick('sound/effects/alien_footstep_charge1.ogg','sound/effects/alien_footstep_charge2.ogg','sound/effects/alien_footstep_charge3.ogg')
soundin = pick('sound/effects/alien/footstep_charge1.ogg','sound/effects/alien/footstep_charge2.ogg','sound/effects/alien/footstep_charge3.ogg')
if(SFX_ALIEN_RESIN_BUILD)
soundin = pick('sound/effects/alien_resin_build1.ogg','sound/effects/alien_resin_build2.ogg','sound/effects/alien_resin_build3.ogg')
soundin = pick('sound/effects/alien/resin_build1.ogg','sound/effects/alien/resin_build2.ogg','sound/effects/alien/resin_build3.ogg')
if(SFX_ALIEN_RESIN_BREAK)
soundin = pick('sound/effects/alien_resin_break1.ogg','sound/effects/alien_resin_break2.ogg')
soundin = pick('sound/effects/alien/resin_break1.ogg','sound/effects/alien/resin_break2.ogg')
if(SFX_ALIEN_RESIN_MOVE)
soundin = pick('sound/effects/alien_resin_move1.ogg','sound/effects/alien_resin_move2.ogg')
soundin = pick('sound/effects/alien/resin_move1.ogg','sound/effects/alien/resin_move2.ogg')
if(SFX_ALIEN_TALK)
soundin = pick('sound/voice/alien/talk.ogg','sound/voice/alien/talk2.ogg','sound/voice/alien/talk3.ogg')
if(SFX_ALIEN_GROWL)
soundin = pick('sound/voice/alien/growl1.ogg','sound/voice/alien/growl2.ogg','sound/voice/alien/growl3.ogg','sound/voice/alien/growl4.ogg')
if(SFX_ALIEN_HISS)
soundin = pick('sound/voice/alien/hiss1.ogg','sound/voice/alien/hiss2.ogg','sound/voice/alien/hiss3.ogg')
if(SFX_ALIEN_TAIL_SWIPE)
soundin = pick('sound/effects/alien_tail_swipe1.ogg','sound/effects/alien_tail_swipe2.ogg','sound/effects/alien_tail_swipe3.ogg')
soundin = pick('sound/effects/alien/tail_swipe1.ogg','sound/effects/alien/tail_swipe2.ogg','sound/effects/alien/tail_swipe3.ogg')
if(SFX_ALIEN_HELP)
soundin = pick('sound/voice/alien/help1.ogg','sound/voice/alien/help2.ogg')
if(SFX_ALIEN_DROOL)
Expand All @@ -328,13 +328,13 @@ A good representation is: 'byond applies a volume reduction to the sound every X
if(SFX_QUEEN)
soundin = pick('sound/voice/alien/queen_command.ogg','sound/voice/alien/queen_command2.ogg','sound/voice/alien/queen_command3.ogg')
if(SFX_ALIEN_VENTPASS)
soundin = pick('sound/effects/alien_ventpass1.ogg', 'sound/effects/alien_ventpass2.ogg')
soundin = pick('sound/effects/alien/ventpass1.ogg', 'sound/effects/alien/ventpass2.ogg')
if(SFX_BEHEMOTH_STEP_SOUNDS)
soundin = pick('sound/effects/alien_footstep_large1.ogg', 'sound/effects/alien_footstep_large2.ogg', 'sound/effects/alien_footstep_large3.ogg')
soundin = pick('sound/effects/alien/footstep_large1.ogg', 'sound/effects/alien/footstep_large2.ogg', 'sound/effects/alien/footstep_large3.ogg')
if(SFX_BEHEMOTH_ROLLING)
soundin = 'sound/effects/behemoth/behemoth_roll.ogg'
soundin = 'sound/effects/alien/behemoth/roll.ogg'
if(SFX_BEHEMOTH_EARTH_PILLAR_HIT)
soundin = pick('sound/effects/behemoth/earth_pillar_hit_1.ogg', 'sound/effects/behemoth/earth_pillar_hit_2.ogg', 'sound/effects/behemoth/earth_pillar_hit_3.ogg', 'sound/effects/behemoth/earth_pillar_hit_4.ogg', 'sound/effects/behemoth/earth_pillar_hit_5.ogg', 'sound/effects/behemoth/earth_pillar_hit_6.ogg')
soundin = pick('sound/effects/alien/behemoth/earth_pillar_hit_1.ogg', 'sound/effects/alien/behemoth/earth_pillar_hit_2.ogg', 'sound/effects/alien/behemoth/earth_pillar_hit_3.ogg', 'sound/effects/alien/behemoth/earth_pillar_hit_4.ogg', 'sound/effects/alien/behemoth/earth_pillar_hit_5.ogg', 'sound/effects/alien/behemoth/earth_pillar_hit_6.ogg')

// Human
if(SFX_MALE_SCREAM)
Expand Down
2 changes: 1 addition & 1 deletion code/game/turfs/closed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
. = ..()
if(isxenobehemoth(xeno_attacker))
xeno_attacker.do_attack_animation(src)
playsound(src, 'sound/effects/behemoth/earth_pillar_eating.ogg', 10, TRUE)
playsound(src, 'sound/effects/alien/behemoth/earth_pillar_eating.ogg', 10, TRUE)
xeno_attacker.visible_message(span_xenowarning("\The [xeno_attacker] eats away at the [src.name]!"), \
span_xenonotice(pick(
"We eat away at the stone. It tastes good, as expected of our primary diet.",
Expand Down
2 changes: 1 addition & 1 deletion code/modules/atmospherics/machinery/atmosmachinery.dm
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@
if(TIMER_COOLDOWN_CHECK(user, COOLDOWN_VENTSOUND) || silent_crawl)
return
TIMER_COOLDOWN_START(user, COOLDOWN_VENTSOUND, 3 SECONDS)
playsound(src, pick('sound/effects/alien_ventcrawl1.ogg','sound/effects/alien_ventcrawl2.ogg'), 50, TRUE, -3)
playsound(src, pick('sound/effects/alien/ventcrawl1.ogg','sound/effects/alien/ventcrawl2.ogg'), 50, TRUE, -3)
else if((direction & initialize_directions) || is_type_in_typecache(src, GLOB.ventcrawl_machinery) && can_crawl_through()) //if we move in a way the pipe can connect, but doesn't - or we're in a vent
climb_out(user, src.loc)

Expand Down
2 changes: 1 addition & 1 deletion code/modules/flufftext/Hallucination.dm
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if("apc sparks")
target.playsound_local(source, SFX_SPARKS, 35, TRUE)
if("hugged")
target.playsound_local(source, 'sound/effects/alien_egg_move.ogg', 35, TRUE)
target.playsound_local(source, 'sound/effects/alien/egg_move.ogg', 35, TRUE)
sleep(1 SECONDS)
target.playsound_local(source, pick(SFX_MALE_HUGGED, SFX_FEMALE_HUGGED), 35, TRUE)
if("weed placed")
Expand Down
Loading

0 comments on commit bc70859

Please sign in to comment.