Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorgs sound folder a bit. #38

Merged
merged 22 commits into from
Jul 26, 2024
  •  
  •  
  •  
168 changes: 84 additions & 84 deletions code/__DEFINES/footsteps.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ GLOBAL_LIST_INIT(shoefootstep, list(
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 100, 1),
FOOTSTEP_RESIN = list(list(
'sound/effects/footstep/alien_resin_move1.ogg',
'sound/effects/footstep/alien_resin_move2.ogg',), 50, 2),
'sound/effects/footstep/alien/resin_move1.ogg',
'sound/effects/footstep/alien/resin_move2.ogg',), 50, 2),
FOOTSTEP_CATWALK = list(list(
'sound/effects/footstep/catwalk1.ogg',
'sound/effects/footstep/catwalk2.ogg',
Expand Down Expand Up @@ -156,8 +156,8 @@ GLOBAL_LIST_INIT(barefootstep, list(
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 100, 1),
FOOTSTEP_RESIN = list(list(
'sound/effects/footstep/alien_resin_move1.ogg',
'sound/effects/footstep/alien_resin_move2.ogg',), 70, 2),
'sound/effects/footstep/alien/resin_move1.ogg',
'sound/effects/footstep/alien/resin_move2.ogg',), 70, 2),
FOOTSTEP_CATWALK = list(list(
'sound/effects/footstep/catwalk1.ogg',
'sound/effects/footstep/catwalk2.ogg',
Expand Down Expand Up @@ -246,8 +246,8 @@ GLOBAL_LIST_INIT(xenomediumstep, list(
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 50, 1),
FOOTSTEP_RESIN = list(list(
'sound/effects/footstep/alien_resin_move1.ogg',
'sound/effects/footstep/alien_resin_move2.ogg',), 15, -4),
'sound/effects/footstep/alien/resin_move1.ogg',
'sound/effects/footstep/alien/resin_move2.ogg',), 15, -4),
FOOTSTEP_CATWALK = list(list(
'sound/effects/footstep/catwalk1.ogg',
'sound/effects/footstep/catwalk2.ogg',
Expand Down Expand Up @@ -360,120 +360,120 @@ GLOBAL_LIST_INIT(xenoheavystep, list(
//claw footsteps lists
GLOBAL_LIST_INIT(xenostompy, list(
FOOTSTEP_WOOD = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 60, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 60, 1),
FOOTSTEP_PLATING = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 70, 1),
FOOTSTEP_FLOOR = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 70, 1),
FOOTSTEP_HARD = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 70, 1),
FOOTSTEP_CARPET = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 55, -1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 55, -1),
FOOTSTEP_SAND = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 55, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 55, 1),
FOOTSTEP_GRASS = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 65, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 65, 1),
FOOTSTEP_WATER = list(list(
'sound/effects/footstep/water1.ogg',
'sound/effects/footstep/water2.ogg',
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 50, 1),
FOOTSTEP_CATWALK = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 70, 1),
FOOTSTEP_SNOW = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 70, 1),
FOOTSTEP_ICE = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 50, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 50, 1),
FOOTSTEP_CONCRETE = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 70, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 70, 1),
FOOTSTEP_GRAVEL = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 55, 1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 55, 1),
FOOTSTEP_RESIN = list(list(
'sound/effects/footstep/alien_footstep_large1.ogg',
'sound/effects/footstep/alien_footstep_large2.ogg',
'sound/effects/footstep/alien_footstep_large3.ogg'), 40, -1),
'sound/effects/footstep/alien/large1.ogg',
'sound/effects/footstep/alien/large2.ogg',
'sound/effects/footstep/alien/large3.ogg'), 40, -1),
))

GLOBAL_LIST_INIT(predalienstompy, list(
FOOTSTEP_WOOD = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 60, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 60, 1),
FOOTSTEP_PLATING = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 70, 1),
FOOTSTEP_FLOOR = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 70, 1),
FOOTSTEP_HARD = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 70, 1),
FOOTSTEP_CARPET = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 55, -1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 55, -1),
FOOTSTEP_SAND = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 55, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 55, 1),
FOOTSTEP_GRASS = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 65, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 65, 1),
FOOTSTEP_WATER = list(list(
'sound/effects/footstep/water1.ogg',
'sound/effects/footstep/water2.ogg',
'sound/effects/footstep/water3.ogg',
'sound/effects/footstep/water4.ogg'), 50, 1),
FOOTSTEP_CATWALK = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 70, 1),
FOOTSTEP_SNOW = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 70, 1),
FOOTSTEP_ICE = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 50, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 50, 1),
FOOTSTEP_CONCRETE = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 70, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 70, 1),
FOOTSTEP_GRAVEL = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 55, 1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 55, 1),
FOOTSTEP_RESIN = list(list(
'sound/effects/footstep/alien_footstep_medium1.ogg',
'sound/effects/footstep/alien_footstep_medium2.ogg',
'sound/effects/footstep/alien_footstep_medium3.ogg'), 40, -1),
'sound/effects/footstep/alien/medium1.ogg',
'sound/effects/footstep/alien/medium2.ogg',
'sound/effects/footstep/alien/medium3.ogg'), 40, -1),
))
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/far0.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/far0.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/far0.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/far0.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/far0.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/far0.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/far0.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/far0.ogg', channel = CHANNEL_CINEMATIC))
special()
screen.icon_state = "planet_end"
2 changes: 1 addition & 1 deletion code/datums/components/suit_autodoc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
START_PROCESSING(SSobj, src)
if(!silent)
wearer.balloon_alert(wearer, "The automedical suite activates")
playsound(parent,'sound/voice/b18_activate.ogg', 15, 0, 1)
playsound(parent,'sound/voice/b18/activate.ogg', 15, 0, 1)


/**
Expand Down
2 changes: 1 addition & 1 deletion code/datums/elements/limb_support.dm
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,6 @@

if(!dropped && ((limb.limb_status & LIMB_BROKEN) && !(limb.limb_status & LIMB_STABILIZED)))
limb.limb_status |= LIMB_STABILIZED
playsound(worn_suit, 'sound/voice/b18_fracture.ogg', 15, 0, 1)
playsound(worn_suit, 'sound/voice/b18/fracture.ogg', 15, 0, 1)
to_chat(injured_mob, span_notice("<b>You feel [worn_suit] constrict about your [limb.display_name], stabilizing it.</b>"))
playsound(worn_suit, 'sound/machines/hydraulics_1.ogg', 15, 0, 1)
2 changes: 1 addition & 1 deletion code/datums/status_effects/xeno_buffs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -751,7 +751,7 @@
new /obj/effect/temp_visual/healing(get_turf(owner))

owner.balloon_alert(owner, "Regeneration is no longer accelerated")
owner.playsound_local(owner, 'sound/voice/hiss5.ogg', 25)
owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 25)

return ..()

Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/explosion_recursive.dm
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ explosion resistance exactly as much as their health

msg_admin_ff("Explosion with Power: [power], Falloff: [falloff] in area [epicenter.loc.name] ([epicenter.x],[epicenter.y],[epicenter.z]).", src.loc.x, src.loc.y, src.loc.z [ADMIN_JMP(epicenter)])

playsound(epicenter, 'sound/effects/explosionfar.ogg', 100, 1, round(power ^ 2, 1))
playsound(epicenter, 'sound/effects/explosion/far0.ogg', 100, 1, round(power ^ 2, 1))
var/sound/explosion_sound = sound(get_sfx("explosion_large"))
switch(power)
if(0 to EXPLODE_LIGHT)
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 @@ -173,7 +173,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/newlarva.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 @@ -209,7 +209,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)
user.ex_act(EXPLODE_LIGHT)
qdel(src)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@
layer = ABOVE_MOB_LAYER

/obj/structure/campaign_objective/destruction_objective/nt_pod/Destroy()
playsound(loc, 'sound/voice/predalien_death.ogg', 75, 0)
playsound(loc, 'sound/voice/alien/predalien/death.ogg', 75, 0)
return ..()

//teleporter core
Expand Down
Loading
Loading