diff --git a/code/__DEFINES/footsteps.dm b/code/__DEFINES/footsteps.dm
index 31d7b858e89..1d32f06317b 100644
--- a/code/__DEFINES/footsteps.dm
+++ b/code/__DEFINES/footsteps.dm
@@ -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',
@@ -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',
@@ -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',
@@ -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),
))
diff --git a/code/datums/cinematic.dm b/code/datums/cinematic.dm
index 3f77abe704d..004f93345bf 100644
--- a/code/datums/cinematic.dm
+++ b/code/datums/cinematic.dm
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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"
@@ -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()
@@ -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"
diff --git a/code/datums/components/suit_autodoc.dm b/code/datums/components/suit_autodoc.dm
index cac077d3328..737fcc6aeba 100644
--- a/code/datums/components/suit_autodoc.dm
+++ b/code/datums/components/suit_autodoc.dm
@@ -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)
/**
diff --git a/code/datums/elements/limb_support.dm b/code/datums/elements/limb_support.dm
index 057d25772f7..5d5feb41bdc 100644
--- a/code/datums/elements/limb_support.dm
+++ b/code/datums/elements/limb_support.dm
@@ -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("You feel [worn_suit] constrict about your [limb.display_name], stabilizing it."))
playsound(worn_suit, 'sound/machines/hydraulics_1.ogg', 15, 0, 1)
diff --git a/code/datums/status_effects/xeno_buffs.dm b/code/datums/status_effects/xeno_buffs.dm
index 45ee88b8ce2..f6deb2ea740 100644
--- a/code/datums/status_effects/xeno_buffs.dm
+++ b/code/datums/status_effects/xeno_buffs.dm
@@ -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 ..()
diff --git a/code/game/objects/explosion_recursive.dm b/code/game/objects/explosion_recursive.dm
index 15fbc4e3ccc..20fd7a2dbaa 100644
--- a/code/game/objects/explosion_recursive.dm
+++ b/code/game/objects/explosion_recursive.dm
@@ -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)
diff --git a/code/game/objects/items/cocoon.dm b/code/game/objects/items/cocoon.dm
index 22d0030e892..3456de75fd4 100644
--- a/code/game/objects/items/cocoon.dm
+++ b/code/game/objects/items/cocoon.dm
@@ -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
diff --git a/code/game/objects/items/loot_box.dm b/code/game/objects/items/loot_box.dm
index 2d2d5238a91..945d1b31605 100644
--- a/code/game/objects/items/loot_box.dm
+++ b/code/game/objects/items/loot_box.dm
@@ -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
diff --git a/code/game/objects/items/radio/headset.dm b/code/game/objects/items/radio/headset.dm
index dd36d3b7f99..7e15c50ed3f 100644
--- a/code/game/objects/items/radio/headset.dm
+++ b/code/game/objects/items/radio/headset.dm
@@ -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)
diff --git a/code/game/objects/structures/campaign_structures/destroy_objectives.dm b/code/game/objects/structures/campaign_structures/destroy_objectives.dm
index c4c8e855d4b..1a3d91e0dcf 100644
--- a/code/game/objects/structures/campaign_structures/destroy_objectives.dm
+++ b/code/game/objects/structures/campaign_structures/destroy_objectives.dm
@@ -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
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 3c908ca82a0..310dd41601c 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -178,17 +178,17 @@ A good representation is: 'byond applies a volume reduction to the sound every X
if("shatter")
S = pick('sound/effects/glassbr1.ogg','sound/effects/glassbr2.ogg','sound/effects/glassbr3.ogg')
if("explosion_large")
- S = 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')
+ S = 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("explosion_micro")
- S = pick('sound/effects/explosion_micro1.ogg','sound/effects/explosion_micro2.ogg','sound/effects/explosion_micro3.ogg')
+ S = pick('sound/effects/explosion/micro1.ogg','sound/effects/explosion/micro2.ogg','sound/effects/explosion/micro3.ogg')
if("explosion_small")
- S = pick('sound/effects/explosion_small1.ogg','sound/effects/explosion_small2.ogg','sound/effects/explosion_small3.ogg','sound/effects/explosion_small4.ogg')
+ S = pick('sound/effects/explosion/small1.ogg','sound/effects/explosion/small2.ogg','sound/effects/explosion/small3.ogg','sound/effects/explosion/small4.ogg')
if("explosion_med")
- S = 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')
+ S = 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("explosion_small_distant")
- S = pick('sound/effects/explosion_smallfar1.ogg','sound/effects/explosion_smallfar2.ogg','sound/effects/explosion_smallfar3.ogg','sound/effects/explosion_smallfar4.ogg')
+ S = 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("explosion_large_distant")
- S = 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')
+ S = 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("explosion_creak")
S = pick('sound/effects/creak1.ogg','sound/effects/creak2.ogg')
if("sparks")
@@ -214,7 +214,7 @@ A good representation is: 'byond applies a volume reduction to the sound every X
if("vending")
S = pick('sound/machines/vending_cans.ogg', 'sound/machines/vending_drop.ogg')
if("incendiary_explosion")
- S = pick('sound/effects/incendiary_explosion_1.ogg', 'sound/effects/incendiary_explosion_2.ogg', 'sound/effects/incendiary_explosion_3.ogg')
+ S = pick('sound/effects/explosion/incendiary1.ogg', 'sound/effects/explosion/incendiary2.ogg', 'sound/effects/explosion/incendiary3.ogg')
if("molotov")
S = pick('sound/effects/molotov_detonate_1.ogg', 'sound/effects/molotov_detonate_2.ogg', 'sound/effects/molotov_detonate_3.ogg')
if("flashbang")
@@ -279,83 +279,83 @@ A good representation is: 'byond applies a volume reduction to the sound every X
if("alien_tail_attack")
S = 'sound/weapons/alien_tail_attack.ogg'
if("alien_footstep_large")
- S = pick('sound/effects/alien_footstep_large1.ogg','sound/effects/alien_footstep_large2.ogg','sound/effects/alien_footstep_large3.ogg')
+ S = pick('sound/effects/footstep/alien/large1.ogg','sound/effects/footstep/alien/large2.ogg','sound/effects/footstep/alien/large3.ogg')
if("alien_charge")
- S = pick('sound/effects/alien_footstep_charge1.ogg','sound/effects/alien_footstep_charge2.ogg','sound/effects/alien_footstep_charge3.ogg')
+ S = pick('sound/effects/footstep/alien/charge1.ogg','sound/effects/footstep/alien/charge2.ogg','sound/effects/footstep/alien/charge3.ogg')
if("alien_resin_build")
- S = pick('sound/effects/alien_resin_build1.ogg','sound/effects/alien_resin_build2.ogg','sound/effects/alien_resin_build3.ogg')
+ S = pick('sound/effects/alien/resin_build1.ogg','sound/effects/alien/resin_build2.ogg','sound/effects/alien/resin_build3.ogg')
if("alien_resin_break")
- S = pick('sound/effects/alien_resin_break1.ogg','sound/effects/alien_resin_break2.ogg')
- if("alien_resin_move")
- S = pick('sound/effects/alien_resin_move1.ogg','sound/effects/alien_resin_move2.ogg')
+ S = pick('sound/effects/alien/resin_break1.ogg','sound/effects/alien/resin_break2.ogg')
+ if("alien_resin_move") // be aware, this isn't a footstep, footsteps are located elsewhere
+ S = pick('sound/effects/alien/resin_move1.ogg', 'sound/effects/alien/resin_move2.ogg')
if("alien_talk")
- S = pick('sound/voice/alien_talk.ogg','sound/voice/alien_talk2.ogg','sound/voice/alien_talk3.ogg')
+ S = pick('sound/voice/alien/talk.ogg','sound/voice/alien/talk2.ogg','sound/voice/alien/talk3.ogg')
if("larva_talk")
- S = pick('sound/voice/larva_talk1.ogg','sound/voice/larva_talk2.ogg','sound/voice/larva_talk3.ogg', 'sound/voice/larva_talk4.ogg')
+ S = pick('sound/voice/alien/larva/talk1.ogg','sound/voice/alien/larva/talk2.ogg','sound/voice/alien/larva/talk3.ogg', 'sound/voice/alien/larva/talk4.ogg')
if("predalien_talk")
- S = pick('sound/voice/predalien_click1.ogg','sound/voice/predalien_click2.ogg','sound/voice/predalien_click3.ogg')
+ S = pick('sound/voice/alien/predalien/click1.ogg','sound/voice/alien/predalien/click2.ogg','sound/voice/alien/predalien/click3.ogg')
if("alien_growl")
- S = pick('sound/voice/alien_growl1.ogg','sound/voice/alien_growl2.ogg','sound/voice/alien_growl3.ogg','sound/voice/alien_growl4.ogg')
+ S = pick('sound/voice/alien/growl1.ogg','sound/voice/alien/growl2.ogg','sound/voice/alien/growl3.ogg','sound/voice/alien/growl4.ogg')
if("alien_hiss")
- S = pick('sound/voice/alien_hiss1.ogg','sound/voice/alien_hiss2.ogg','sound/voice/alien_hiss3.ogg')
+ S = pick('sound/voice/alien/hiss1.ogg','sound/voice/alien/hiss2.ogg','sound/voice/alien/hiss3.ogg')
if("alien_tail_swipe")
- S = pick('sound/effects/alien_tail_swipe1.ogg','sound/effects/alien_tail_swipe2.ogg','sound/effects/alien_tail_swipe3.ogg')
+ S = pick('sound/effects/alien/tail_swipe1.ogg','sound/effects/alien/tail_swipe2.ogg','sound/effects/alien/tail_swipe3.ogg')
if("alien_help")
- S = pick('sound/voice/alien_help1.ogg','sound/voice/alien_help2.ogg')
+ S = pick('sound/voice/alien/help1.ogg','sound/voice/alien/help2.ogg')
if("alien_drool")
- S = pick('sound/voice/alien_drool1.ogg','sound/voice/alien_drool2.ogg')
+ S = pick('sound/voice/alien/drool1.ogg','sound/voice/alien/drool2.ogg')
if("alien_roar")
- S = pick('sound/voice/alien_roar1.ogg','sound/voice/alien_roar2.ogg','sound/voice/alien_roar3.ogg','sound/voice/alien_roar4.ogg','sound/voice/alien_roar5.ogg','sound/voice/alien_roar6.ogg','sound/voice/alien_roar7.ogg','sound/voice/alien_roar8.ogg','sound/voice/alien_roar9.ogg','sound/voice/alien_roar10.ogg','sound/voice/alien_roar11.ogg','sound/voice/alien_roar12.ogg')
+ S = pick('sound/voice/alien/roar1.ogg','sound/voice/alien/roar2.ogg','sound/voice/alien/roar3.ogg','sound/voice/alien/roar4.ogg','sound/voice/alien/roar5.ogg','sound/voice/alien/roar6.ogg','sound/voice/alien/roar7.ogg','sound/voice/alien/roar8.ogg','sound/voice/alien/roar9.ogg','sound/voice/alien/roar10.ogg','sound/voice/alien/roar11.ogg','sound/voice/alien/roar12.ogg')
if("alien_roar_larva")
- S = pick('sound/voice/alien_roar_larva1.ogg','sound/voice/alien_roar_larva2.ogg','sound/voice/alien_roar_larva3.ogg','sound/voice/alien_roar_larva4.ogg')
+ S = pick('sound/voice/alien/larva/roar1.ogg','sound/voice/alien/larva/roar2.ogg','sound/voice/alien/larva/roar3.ogg','sound/voice/alien/larva/roar4.ogg')
if("queen")
- S = pick('sound/voice/alien_queen_command.ogg','sound/voice/alien_queen_command2.ogg','sound/voice/alien_queen_command3.ogg')
+ S = pick('sound/voice/alien/queen/command.ogg','sound/voice/alien/queen/command2.ogg','sound/voice/alien/queen/command3.ogg')
if("alien_ventpass")
- S = pick('sound/effects/alien_ventpass1.ogg', 'sound/effects/alien_ventpass2.ogg')
+ S = pick('sound/effects/alien/ventpass1.ogg', 'sound/effects/alien/ventpass2.ogg')
if("behemoth_step_sounds")
- S = pick('sound/effects/alien_footstep_large1.ogg', 'sound/effects/alien_footstep_large2.ogg', 'sound/effects/alien_footstep_large3.ogg')
+ S = pick('sound/effects/footstep/alien/large1.ogg', 'sound/effects/footstep/alien/large2.ogg', 'sound/effects/footstep/alien/large3.ogg')
if("behemoth_rolling")
- S = 'sound/effects/behemoth/behemoth_roll.ogg'
+ S = 'sound/effects/alien/behemoth/roll.ogg'
if("behemoth_earth_pillar_hit")
- S = 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')
+ S = 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("male_scream")
- S = pick('sound/voice/human_male_scream_1.ogg','sound/voice/human_male_scream_2.ogg','sound/voice/human_male_scream_3.ogg','sound/voice/human_male_scream_4.ogg','sound/voice/human_male_scream_5.ogg','sound/voice/human_male_scream_6.ogg', 'sound/voice/human_male_scream_7.ogg')
+ S = pick('sound/voice/human/male/scream_1.ogg','sound/voice/human/male/scream_2.ogg','sound/voice/human/male/scream_3.ogg','sound/voice/human/male/scream_4.ogg','sound/voice/human/male/scream_5.ogg','sound/voice/human/male/scream_6.ogg', 'sound/voice/human/male/scream_7.ogg')
if("male_pain")
- S = pick('sound/voice/human_male_pain_1.ogg','sound/voice/human_male_pain_2.ogg','sound/voice/human_male_pain_3.ogg','sound/voice/human_male_pain_4.ogg','sound/voice/human_male_pain_5.ogg','sound/voice/human_male_pain_6.ogg','sound/voice/human_male_pain_7.ogg','sound/voice/human_male_pain_8.ogg', 'sound/voice/human_male_pain_9.ogg', 'sound/voice/human_male_pain_10.ogg', 'sound/voice/human_male_pain_11.ogg')
+ S = pick('sound/voice/human/male/pain_1.ogg','sound/voice/human/male/pain_2.ogg','sound/voice/human/male/pain_3.ogg','sound/voice/human/male/pain_4.ogg','sound/voice/human/male/pain_5.ogg','sound/voice/human/male/pain_6.ogg','sound/voice/human/male/pain_7.ogg','sound/voice/human/male/pain_8.ogg', 'sound/voice/human/male/pain_9.ogg', 'sound/voice/human/male/pain_10.ogg', 'sound/voice/human/male/pain_11.ogg')
if("male_gored")
- S = pick('sound/voice/human_male_gored_1.ogg','sound/voice/human_male_gored_2.ogg', 'sound/voice/human_male_gored3.ogg')
+ S = pick('sound/voice/human/male/gored_1.ogg','sound/voice/human/male/gored_2.ogg', 'sound/voice/human/male/gored3.ogg')
if("male_fragout")
- S = pick('sound/voice/human_male_grenadethrow_1.ogg', 'sound/voice/human_male_grenadethrow_2.ogg', 'sound/voice/human_male_grenadethrow_3.ogg')
+ S = pick('sound/voice/human/male/grenadethrow_1.ogg', 'sound/voice/human/male/grenadethrow_2.ogg', 'sound/voice/human/male/grenadethrow_3.ogg')
if("male_warcry")
- S = pick('sound/voice/human_male_warcry_1.ogg','sound/voice/human_male_warcry_2.ogg','sound/voice/human_male_warcry_3.ogg','sound/voice/human_male_warcry_4.ogg','sound/voice/human_male_warcry_5.ogg','sound/voice/human_male_warcry_6.ogg','sound/voice/human_male_warcry_7.ogg','sound/voice/human_male_warcry_8.ogg','sound/voice/human_male_warcry_9.ogg','sound/voice/human_male_warcry_10.ogg','sound/voice/human_male_warcry_11.ogg','sound/voice/human_male_warcry_12.ogg','sound/voice/human_male_warcry_13.ogg','sound/voice/human_male_warcry_14.ogg','sound/voice/human_male_warcry_15.ogg','sound/voice/human_male_warcry_16.ogg','sound/voice/human_male_warcry_17.ogg','sound/voice/human_male_warcry_18.ogg','sound/voice/human_male_warcry_19.ogg','sound/voice/human_male_warcry_20.ogg','sound/voice/human_male_warcry_21.ogg','sound/voice/human_male_warcry_22.ogg','sound/voice/human_male_warcry_23.ogg','sound/voice/human_male_warcry_24.ogg','sound/voice/human_male_warcry_25.ogg','sound/voice/human_male_warcry_26.ogg','sound/voice/human_male_warcry_27.ogg','sound/voice/human_male_warcry_28.ogg','sound/voice/human_male_warcry_29.ogg')
+ S = pick('sound/voice/human/male/warcry_1.ogg','sound/voice/human/male/warcry_2.ogg','sound/voice/human/male/warcry_3.ogg','sound/voice/human/male/warcry_4.ogg','sound/voice/human/male/warcry_5.ogg','sound/voice/human/male/warcry_6.ogg','sound/voice/human/male/warcry_7.ogg','sound/voice/human/male/warcry_8.ogg','sound/voice/human/male/warcry_9.ogg','sound/voice/human/male/warcry_10.ogg','sound/voice/human/male/warcry_11.ogg','sound/voice/human/male/warcry_12.ogg','sound/voice/human/male/warcry_13.ogg','sound/voice/human/male/warcry_14.ogg','sound/voice/human/male/warcry_15.ogg','sound/voice/human/male/warcry_16.ogg','sound/voice/human/male/warcry_17.ogg','sound/voice/human/male/warcry_18.ogg','sound/voice/human/male/warcry_19.ogg','sound/voice/human/male/warcry_20.ogg','sound/voice/human/male/warcry_21.ogg','sound/voice/human/male/warcry_22.ogg','sound/voice/human/male/warcry_23.ogg','sound/voice/human/male/warcry_24.ogg','sound/voice/human/male/warcry_25.ogg','sound/voice/human/male/warcry_26.ogg','sound/voice/human/male/warcry_27.ogg','sound/voice/human/male/warcry_28.ogg','sound/voice/human/male/warcry_29.ogg')
if("female_scream")
- S = pick('sound/voice/human_female_scream_1.ogg','sound/voice/human_female_scream_2.ogg','sound/voice/human_female_scream_3.ogg','sound/voice/human_female_scream_4.ogg','sound/voice/human_female_scream_5.ogg')
+ S = pick('sound/voice/human/female/scream_1.ogg','sound/voice/human/female/scream_2.ogg','sound/voice/human/female/scream_3.ogg','sound/voice/human/female/scream_4.ogg','sound/voice/human/female/scream_5.ogg')
if("female_pain")
- S = pick('sound/voice/human_female_pain_1.ogg','sound/voice/human_female_pain_2.ogg','sound/voice/human_female_pain_3.ogg')
+ S = pick('sound/voice/human/female/pain_1.ogg','sound/voice/human/female/pain_2.ogg','sound/voice/human/female/pain_3.ogg')
if("female_gored")
- S = pick('sound/voice/human_female_gored_1.ogg','sound/voice/human_female_gored_2.ogg')
+ S = pick('sound/voice/human/female/gored_1.ogg','sound/voice/human/female/gored_2.ogg')
if("female_fragout")
- S = pick("sound/voice/human_female_grenadethrow_1.ogg", 'sound/voice/human_female_grenadethrow_2.ogg', 'sound/voice/human_female_grenadethrow_3.ogg')
+ S = pick("sound/voice/human/female/grenadethrow_1.ogg", 'sound/voice/human/female/grenadethrow_2.ogg', 'sound/voice/human/female/grenadethrow_3.ogg')
if("female_warcry")
- S = pick('sound/voice/human_female_warcry_1.ogg','sound/voice/human_female_warcry_2.ogg','sound/voice/human_female_warcry_3.ogg','sound/voice/human_female_warcry_4.ogg','sound/voice/human_female_warcry_5.ogg','sound/voice/human_female_warcry_6.ogg','sound/voice/human_female_warcry_7.ogg','sound/voice/human_female_warcry_8.ogg','sound/voice/human_female_warcry_9.ogg','sound/voice/human_female_warcry_10.ogg','sound/voice/human_female_warcry_11.ogg','sound/voice/human_female_warcry_12.ogg','sound/voice/human_female_warcry_13.ogg','sound/voice/human_female_warcry_14.ogg','sound/voice/human_female_warcry_15.ogg','sound/voice/human_female_warcry_16.ogg','sound/voice/human_female_warcry_17.ogg','sound/voice/human_female_warcry_18.ogg','sound/voice/human_female_warcry_19.ogg')
+ S = pick('sound/voice/human/female/warcry_1.ogg','sound/voice/human/female/warcry_2.ogg','sound/voice/human/female/warcry_3.ogg','sound/voice/human/female/warcry_4.ogg','sound/voice/human/female/warcry_5.ogg','sound/voice/human/female/warcry_6.ogg','sound/voice/human/female/warcry_7.ogg','sound/voice/human/female/warcry_8.ogg','sound/voice/human/female/warcry_9.ogg','sound/voice/human/female/warcry_10.ogg','sound/voice/human/female/warcry_11.ogg','sound/voice/human/female/warcry_12.ogg','sound/voice/human/female/warcry_13.ogg','sound/voice/human/female/warcry_14.ogg','sound/voice/human/female/warcry_15.ogg','sound/voice/human/female/warcry_16.ogg','sound/voice/human/female/warcry_17.ogg','sound/voice/human/female/warcry_18.ogg','sound/voice/human/female/warcry_19.ogg')
if("male_hugged")
- S = pick("sound/voice/human_male_facehugged1.ogg", 'sound/voice/human_male_facehugged2.ogg', 'sound/voice/human_male_facehugged3.ogg')
+ S = pick("sound/voice/human/male/facehugged1.ogg", 'sound/voice/human/male/facehugged2.ogg', 'sound/voice/human/male/facehugged3.ogg')
if("female_hugged")
- S = pick("sound/voice/human_female_facehugged1.ogg", 'sound/voice/human_female_facehugged2.ogg')
+ S = pick("sound/voice/human/female/facehugged1.ogg", 'sound/voice/human/female/facehugged2.ogg')
if("male_gasp")
- S = pick("sound/voice/human_male_gasp1.ogg", 'sound/voice/human_male_gasp2.ogg', 'sound/voice/human_male_gasp3.ogg')
+ S = pick("sound/voice/human/male/gasp1.ogg", 'sound/voice/human/male/gasp2.ogg', 'sound/voice/human/male/gasp3.ogg')
if("female_gasp")
- S = pick("sound/voice/human_female_gasp1.ogg", 'sound/voice/human_female_gasp2.ogg')
+ S = pick("sound/voice/human/female/gasp1.ogg", 'sound/voice/human/female/gasp2.ogg')
if("male_cough")
- S = pick("sound/voice/human_male_cough1.ogg", 'sound/voice/human_male_cough2.ogg')
+ S = pick("sound/voice/human/male/cough1.ogg", 'sound/voice/human/male/cough2.ogg')
if("female_cough")
- S = pick("sound/voice/human_female_cough1.ogg", 'sound/voice/human_female_cough2.ogg')
+ S = pick("sound/voice/human/female/cough1.ogg", 'sound/voice/human/female/cough2.ogg')
if("male_preburst")
- S = pick("sound/voice/human_male_preburst1.ogg", 'sound/voice/human_male_preburst2.ogg', 'sound/voice/human_male_preburst3.ogg', 'sound/voice/human_male_preburst4.ogg', 'sound/voice/human_male_preburst5.ogg', 'sound/voice/human_male_preburst6.ogg', 'sound/voice/human_male_preburst7.ogg', 'sound/voice/human_male_preburst8.ogg', 'sound/voice/human_male_preburst9.ogg', 'sound/voice/human_male_preburst10.ogg')
+ S = pick("sound/voice/human/male/preburst1.ogg", 'sound/voice/human/male/preburst2.ogg', 'sound/voice/human/male/preburst3.ogg', 'sound/voice/human/male/preburst4.ogg', 'sound/voice/human/male/preburst5.ogg', 'sound/voice/human/male/preburst6.ogg', 'sound/voice/human/male/preburst7.ogg', 'sound/voice/human/male/preburst8.ogg', 'sound/voice/human/male/preburst9.ogg', 'sound/voice/human/male/preburst10.ogg')
if("female_preburst")
- S = pick("sound/voice/human_female_preburst1.ogg", 'sound/voice/human_female_preburst2.ogg', 'sound/voice/human_female_preburst3.ogg')
+ S = pick("sound/voice/human/female/preburst1.ogg", 'sound/voice/human/female/preburst2.ogg', 'sound/voice/human/female/preburst3.ogg')
if("jump")
S = pick('sound/effects/bounce_1.ogg','sound/effects/bounce_2.ogg','sound/effects/bounce_3.ogg','sound/effects/bounce_4.ogg')
@@ -369,15 +369,15 @@ A good representation is: 'byond applies a volume reduction to the sound every X
//yautja race
if("pred_scream")
- S = pick('sound/voice/pred_roar1.ogg','sound/voice/pred_roar2.ogg','sound/voice/pred_roar3.ogg','sound/voice/pred_roar4.ogg','sound/voice/pred_roar5.ogg')
+ S = pick('sound/voice/predator/roar1.ogg','sound/voice/predator/roar2.ogg','sound/voice/predator/roar3.ogg','sound/voice/predator/roar4.ogg','sound/voice/predator/roar5.ogg')
if("pred_pain")
- S = pick('sound/voice/pred_pain1.ogg','sound/voice/pred_pain2.ogg','sound/voice/pred_pain3.ogg','sound/voice/pred_pain4.ogg','sound/voice/pred_pain5.ogg')
+ S = pick('sound/voice/predator/pain1.ogg','sound/voice/predator/pain2.ogg','sound/voice/predator/pain3.ogg','sound/voice/predator/pain4.ogg','sound/voice/predator/pain5.ogg')
if("pred_hugged")
- S = pick('sound/voice/pred_facehugged.ogg')
+ S = pick('sound/voice/predator/facehugged.ogg')
if("pred_preburst")
- S = pick('sound/voice/pred_pain_rare1.ogg')
+ S = pick('sound/voice/predator/pain_rare1.ogg')
if("pred_warcry")
- S = pick('sound/voice/pred_warcry.ogg')
+ S = pick('sound/voice/predator/warcry.ogg')
//pred items
if("clan_sword_hit")
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index eb27ddf1d05..58c293c9007 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -58,7 +58,7 @@
. = ..()
if(isxenobehemoth(xeno_user))
xeno_user.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_user.visible_message(span_xenowarning("\The [xeno_user] eats away at the [src.name]!"), \
span_xenonotice(pick(
"We eat away at the stone. It tastes good, as expected of our primary diet.",
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index 829f17ac96c..8a4a1c2081f 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -307,7 +307,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)
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 4f9a8438e90..61f186a7e5f 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -282,7 +282,7 @@ GLOBAL_LIST_INIT(hallucination_list, list(
if("apc sparks")
target.playsound_local(source, get_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, get_sfx("[pick("male", "female")]_hugged"), 35, TRUE)
if("weed placed")
diff --git a/code/modules/mob/living/carbon/human/emote-yautja.dm b/code/modules/mob/living/carbon/human/emote-yautja.dm
index d19cadf19fd..fe38dbbfa23 100644
--- a/code/modules/mob/living/carbon/human/emote-yautja.dm
+++ b/code/modules/mob/living/carbon/human/emote-yautja.dm
@@ -3,7 +3,7 @@
/datum/emote/living/carbon/human/species/yautja/anytime
key = "anytime"
- sound = 'sound/voice/pred_anytime.ogg'
+ sound = 'sound/voice/predator/anytime.ogg'
key_third_person = "anytime"
message = "any time"
emote_type = EMOTE_AUDIBLE
@@ -16,13 +16,13 @@
/datum/emote/living/carbon/human/species/yautja/click/get_sound(mob/living/user)
if(rand(0,100) < 50)
- return 'sound/voice/pred_click1.ogg'
+ return 'sound/voice/predator/click1.ogg'
else
- return 'sound/voice/pred_click2.ogg'
+ return 'sound/voice/predator/click2.ogg'
/datum/emote/living/carbon/human/species/yautja/helpme
key = "helpme"
- sound = 'sound/voice/pred_helpme.ogg'
+ sound = 'sound/voice/predator/helpme.ogg'
key_third_person = "helpme"
message = "help me!"
emote_type = EMOTE_AUDIBLE
@@ -36,42 +36,42 @@
/datum/emote/living/carbon/human/species/yautja/itsatrap
key = "itsatrap"
- sound = 'sound/voice/pred_itsatrap.ogg'
+ sound = 'sound/voice/predator/itsatrap.ogg'
key_third_person = "itsatrap"
message = "it's a trap!"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/laugh1
key = "laugh1"
- sound = 'sound/voice/pred_laugh1.ogg'
+ sound = 'sound/voice/predator/laugh1.ogg'
key_third_person = "laugh1"
message = "laughs"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/laugh2
key = "laugh2"
- sound = 'sound/voice/pred_laugh2.ogg'
+ sound = 'sound/voice/predator/laugh2.ogg'
key_third_person = "laugh2"
message = "laughs"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/laugh3
key = "laugh3"
- sound = 'sound/voice/pred_laugh3.ogg'
+ sound = 'sound/voice/predator/laugh3.ogg'
key_third_person = "laugh3"
message = "laughs"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/laugh4
key = "laugh4"
- sound = 'sound/voice/pred_laugh4.ogg'
+ sound = 'sound/voice/predator/laugh4.ogg'
key_third_person = "laugh4"
message = "laughs"
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/overhere
key = "overhere"
- sound = 'sound/voice/pred_overhere.ogg'
+ sound = 'sound/voice/predator/overhere.ogg'
key_third_person = "overhere"
message = "over here!"
emote_type = EMOTE_AUDIBLE
@@ -83,12 +83,12 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/predroar/get_sound(mob/living/user)
- return pick('sound/voice/pred_roar1.ogg', 'sound/voice/pred_roar2.ogg')
+ return pick('sound/voice/predator/roar1.ogg', 'sound/voice/predator/roar2.ogg')
/datum/emote/living/carbon/human/species/yautja/predroar2
key = "predroar2"
key_third_person = "predroars2"
- sound = 'sound/voice/pred_roar3.ogg'
+ sound = 'sound/voice/predator/roar3.ogg'
message = "roars!"
emote_type = EMOTE_AUDIBLE
@@ -100,7 +100,7 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/loudroar/get_sound(mob/living/user)
- return pick('sound/voice/pred_roar4.ogg', 'sound/voice/pred_roar5.ogg')
+ return pick('sound/voice/predator/roar4.ogg', 'sound/voice/predator/roar5.ogg')
/datum/emote/living/carbon/human/species/yautja/loudroar/run_emote(mob/user, params, type_override, intentional)
. = ..()
@@ -118,7 +118,7 @@
key = "turnaround"
key_third_person = "turnaround"
message = "turn around!"
- sound = 'sound/voice/pred_turnaround.ogg'
+ sound = 'sound/voice/predator/turnaround.ogg'
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/click2
@@ -128,7 +128,7 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/click2/get_sound(mob/living/user)
- return pick('sound/voice/pred_click3.ogg', 'sound/voice/pred_click4.ogg')
+ return pick('sound/voice/predator/click3.ogg', 'sound/voice/predator/click4.ogg')
/datum/emote/living/carbon/human/species/yautja/aliengrowl
key = "aliengrowl"
@@ -137,7 +137,7 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/aliengrowl/get_sound(mob/living/user)
- return pick('sound/voice/alien_growl1.ogg', 'sound/voice/alien_growl2.ogg')
+ return pick('sound/voice/alien/growl1.ogg', 'sound/voice/alien/growl2.ogg')
/datum/emote/living/carbon/human/species/yautja/alienhelp
key = "alienhelp"
@@ -146,25 +146,25 @@
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/alienhelp/get_sound(mob/living/user)
- return pick('sound/voice/alien_help1.ogg', 'sound/voice/alien_help2.ogg')
+ return pick('sound/voice/alien/help1.ogg', 'sound/voice/alien/help2.ogg')
/datum/emote/living/carbon/human/species/yautja/comeonout
key = "comeonout"
key_third_person = "comeonout"
message = "come on out!"
- sound = 'sound/voice/pred_come_on_out.ogg'
+ sound = 'sound/voice/predator/come_on_out.ogg'
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/overthere
key = "overthere"
key_third_person = "overthere"
message = "over there!"
- sound = 'sound/voice/pred_over_there.ogg'
+ sound = 'sound/voice/predator/over_there.ogg'
emote_type = EMOTE_AUDIBLE
/datum/emote/living/carbon/human/species/yautja/uglyfreak
key = "uglyfreak"
key_third_person = "uglyfreak"
message = "ugly freak!"
- sound = 'sound/voice/pred_ugly_freak.ogg'
+ sound = 'sound/voice/predator/ugly_freak.ogg'
emote_type = EMOTE_AUDIBLE
diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm
index d6731448d08..a20ec4301f1 100644
--- a/code/modules/mob/living/carbon/human/emote.dm
+++ b/code/modules/mob/living/carbon/human/emote.dm
@@ -373,12 +373,12 @@
/datum/emote/living/carbon/human/laugh/get_sound(mob/living/user)
//RUTGMC EDIT
if(isyautja(user))
- return pick('sound/voice/pred_laugh1.ogg', 'sound/voice/pred_laugh2.ogg', 'sound/voice/pred_laugh3.ogg', 'sound/voice/pred_laugh4.ogg')
+ return pick('sound/voice/predator/laugh1.ogg', 'sound/voice/predator/laugh2.ogg', 'sound/voice/predator/laugh3.ogg', 'sound/voice/predator/laugh4.ogg')
//RUTGMC EDIT
else if(user.gender == FEMALE)
- return 'sound/voice/human_female_laugh_1.ogg'
+ return 'sound/voice/human/female/laugh_1.ogg'
else
- return pick('sound/voice/human_male_laugh_1.ogg', 'sound/voice/human_male_laugh_2.ogg')
+ return pick('sound/voice/human/male/laugh_1.ogg', 'sound/voice/human/male/laugh_2.ogg')
/datum/emote/living/carbon/human/warcry
key = "warcry"
@@ -491,11 +491,11 @@
/datum/emote/living/carbon/human/medic/get_sound(mob/living/carbon/human/user)
if(user.gender == MALE)
if(prob(95))
- return 'sound/voice/human_male_medic.ogg'
+ return 'sound/voice/human/male/medic.ogg'
else
- return 'sound/voice/human_male_medic2.ogg'
+ return 'sound/voice/human/male/medic2.ogg'
else
- return 'sound/voice/human_female_medic.ogg'
+ return 'sound/voice/human/female/medic.ogg'
/datum/emote/living/carbon/human/medic/run_emote(mob/user, params, type_override, intentional = FALSE, prefix)
@@ -590,9 +590,9 @@
if(isrobot(user))
return
if(user.gender == FEMALE)
- return 'sound/voice/human_female_sigh_1.ogg'
+ return 'sound/voice/human/female/sigh_1.ogg'
else
- return 'sound/voice/human_male_sigh_1.ogg'
+ return 'sound/voice/human/male/sigh_1.ogg'
/datum/emote/living/carbon/human/giggle/get_sound(mob/living/user)
@@ -602,36 +602,36 @@
else
return 'sound/voice/robotic/male_giggle.ogg'
if(user.gender == FEMALE)
- return 'sound/voice/human_female_giggle_1.ogg'
+ return 'sound/voice/human/female/giggle_1.ogg'
else
- return 'sound/voice/human_male_giggle_1.ogg'
+ return 'sound/voice/human/male/giggle_1.ogg'
/datum/emote/living/carbon/human/yawn/get_sound(mob/living/user)
if(isrobot(user))
return
if(user.gender == FEMALE)
- return 'sound/voice/human_female_yawn_1.ogg'
+ return 'sound/voice/human/female/yawn_1.ogg'
else
- return 'sound/voice/human_male_yawn_1.ogg'
+ return 'sound/voice/human/male/yawn_1.ogg'
/datum/emote/living/carbon/human/moan/get_sound(mob/living/user)
if(isrobot(user))
return
if(user.gender == FEMALE)
- return 'sound/voice/human_female_moan_1.ogg'
+ return 'sound/voice/human/female/moan_1.ogg'
else
- return 'sound/voice/human_male_moan_1.ogg'
+ return 'sound/voice/human/male/moan_1.ogg'
/datum/emote/living/carbon/human/cry/get_sound(mob/living/user)
if(isrobot(user))
return
if(user.gender == FEMALE)
- return 'sound/voice/human_female_cry_1.ogg'
+ return 'sound/voice/human/female/cry_1.ogg'
else
- return 'sound/voice/human_male_cry_1.ogg'
+ return 'sound/voice/human/male/cry_1.ogg'
/datum/emote/living/carbon/human/laugh/get_sound(mob/living/user)
if(isrobot(user))
@@ -661,7 +661,7 @@
/datum/emote/living/carbon/human/whistle/get_sound(mob/living/user)
if(isrobot(user))
return
- return 'sound/voice/sound_voice_human_whistle1.ogg'
+ return 'sound/voice/human/whistle1.ogg'
/datum/emote/living/carbon/human/crack
key = "crack"
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 088d6eb9f0a..7ab04b5c0d9 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -744,7 +744,7 @@
preferences = list("moth_wings" = "Wings")
screams = list("neuter" = 'sound/voice/moth_scream.ogg')
- paincries = list("neuter" = 'sound/voice/human_male_pain_3.ogg')
+ paincries = list("neuter" = 'sound/voice/human/male/pain_3.ogg')
goredcries = list("neuter" = 'sound/voice/moth_scream.ogg')
burstscreams = list("neuter" = 'sound/voice/moth_scream.ogg')
warcries = list("neuter" = 'sound/voice/moth_scream.ogg')
diff --git a/code/modules/mob/living/carbon/human/yautja.dm b/code/modules/mob/living/carbon/human/yautja.dm
index afbf2b67103..0b5f8433b24 100644
--- a/code/modules/mob/living/carbon/human/yautja.dm
+++ b/code/modules/mob/living/carbon/human/yautja.dm
@@ -33,7 +33,7 @@
max_stamina = 250
blood_color = "#20d450"
flesh_color = "#907E4A"
- speech_sounds = list('sound/voice/pred_click1.ogg', 'sound/voice/pred_click2.ogg')
+ speech_sounds = list('sound/voice/predator/click1.ogg', 'sound/voice/predator/click2.ogg')
speech_chance = 100
death_message = "clicks in agony and falls still, motionless and completely lifeless..."
@@ -254,7 +254,7 @@ var/global/image/hud_icon_hunter_thralled
/mob/living/carbon/human/species/yautja/send_speech(message_raw, message_range = 6, obj/source = src, bubble_type = bubble_icon, list/spans, datum/language/message_language=null, message_mode, tts_message, list/tts_filter)
. = ..()
- playsound(loc, pick('sound/voice/pred_click1.ogg', 'sound/voice/pred_click2.ogg'), 25, 1)
+ playsound(loc, pick('sound/voice/predator/click1.ogg', 'sound/voice/predator/click2.ogg'), 25, 1)
/mob/living/carbon/human/species/yautja/get_idcard(hand_first = TRUE)
. = ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/abilities.dm b/code/modules/mob/living/carbon/xenomorph/abilities.dm
index 8eafcf3a1ae..b9331768eaf 100644
--- a/code/modules/mob/living/carbon/xenomorph/abilities.dm
+++ b/code/modules/mob/living/carbon/xenomorph/abilities.dm
@@ -704,7 +704,7 @@
/datum/action/ability/activable/xeno/spray_acid/on_cooldown_finish()
- playsound(owner.loc, 'sound/voice/alien_drool1.ogg', 50, 1)
+ playsound(owner.loc, 'sound/voice/alien/drool1.ogg', 50, 1)
to_chat(owner, span_xenodanger("We feel our acid glands refill. We can spray acid again."))
return ..()
@@ -817,7 +817,7 @@
/datum/action/ability/activable/xeno/xeno_spit/proc/fire()
var/mob/living/carbon/xenomorph/X = owner
var/turf/current_turf = get_turf(owner)
- var/sound_to_play = pick(1, 2) == 1 ? 'sound/voice/alien_spitacid.ogg' : 'sound/voice/alien_spitacid2.ogg'
+ var/sound_to_play = pick(1, 2) == 1 ? 'sound/voice/alien/spitacid.ogg' : 'sound/voice/alien/spitacid2.ogg'
playsound(X.loc, sound_to_play, 25, 1)
var/obj/projectile/newspit = new /obj/projectile(current_turf)
@@ -939,7 +939,7 @@
return FALSE
/datum/action/ability/activable/xeno/neurotox_sting/on_cooldown_finish()
- playsound(owner.loc, 'sound/voice/alien_drool1.ogg', 50, 1)
+ playsound(owner.loc, 'sound/voice/alien/drool1.ogg', 50, 1)
to_chat(owner, span_xenodanger("We feel our toxic glands refill. We can use our [initial(name)] again."))
return ..()
@@ -1076,7 +1076,7 @@
/datum/action/ability/xeno_action/rally_hive/action_activate()
var/mob/living/carbon/xenomorph/X = owner
- xeno_message("Our leader [X] is rallying the hive to [AREACOORD_NO_Z(X.loc)]!", "xenoannounce", 6, X.hivenumber, FALSE, X, 'sound/voice/alien_distantroar_3.ogg',TRUE,null,/atom/movable/screen/arrow/leader_tracker_arrow)
+ xeno_message("Our leader [X] is rallying the hive to [AREACOORD_NO_Z(X.loc)]!", "xenoannounce", 6, X.hivenumber, FALSE, X, 'sound/voice/alien/distantroar_3.ogg',TRUE,null,/atom/movable/screen/arrow/leader_tracker_arrow)
notify_ghosts("\ [X] is rallying the hive to [AREACOORD_NO_Z(X.loc)]!", source = X, action = NOTIFY_JUMP)
succeed_activate()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm
index 7a3a788ccee..2b1aa2a346e 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/behemoth/abilities_behemoth.dm
@@ -307,7 +307,7 @@
xeno_owner.set_canmove(FALSE)
xeno_owner.behemoth_charging = TRUE
ADD_TRAIT(xeno_owner, TRAIT_SILENT_FOOTSTEPS, XENO_TRAIT)
- playsound(xeno_owner, 'sound/effects/behemoth/landslide_roar.ogg', 40, TRUE)
+ playsound(xeno_owner, 'sound/effects/alien/behemoth/landslide_roar.ogg', 40, TRUE)
var/which_step = pick(0, 1)
new /obj/effect/temp_visual/behemoth/landslide/dust(owner_turf, direction, which_step)
do_warning(xeno_owner, get_affected_turfs(owner_turf, direction, LANDSLIDE_RANGE), LANDSLIDE_WIND_UP + 0.5 SECONDS)
@@ -316,7 +316,7 @@
if(primal_wrath_action?.ability_active)
var/animation_time = LANDSLIDE_RANGE * LANDSLIDE_ENHANCED_STEP_DELAY
addtimer(CALLBACK(src, PROC_REF(enhanced_do_charge), direction, charge_damage, LANDSLIDE_ENHANCED_STEP_DELAY, LANDSLIDE_RANGE), LANDSLIDE_ENHANCED_WIND_UP)
- addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), xeno_owner, 'sound/effects/behemoth/landslide_enhanced_charge.ogg', 30, TRUE), LANDSLIDE_ENHANCED_WIND_UP)
+ addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(playsound), xeno_owner, 'sound/effects/alien/behemoth/landslide_enhanced_charge.ogg', 30, TRUE), LANDSLIDE_ENHANCED_WIND_UP)
animate(xeno_owner, time = LANDSLIDE_ENHANCED_WIND_UP, flags = ANIMATION_END_NOW)
animate(pixel_y = xeno_owner.pixel_y + (LANDSLIDE_RANGE / 2), time = animation_time / 2, easing = CIRCULAR_EASING|EASE_OUT)
animate(pixel_y = initial(xeno_owner.pixel_y), time = animation_time / 2, easing = CIRCULAR_EASING|EASE_IN)
@@ -401,7 +401,7 @@
continue
hit_object(affected_object)
if(LinkBlocked(owner_turf, direct_turf))
- playsound(direct_turf, 'sound/effects/behemoth/behemoth_stomp.ogg', 40, TRUE)
+ playsound(direct_turf, 'sound/effects/alien/behemoth/stomp.ogg', 40, TRUE)
xeno_owner.do_attack_animation(direct_turf)
addtimer(CALLBACK(src, PROC_REF(end_charge)), LANDSLIDE_ENDING_COLLISION_DELAY)
return
@@ -433,7 +433,7 @@
var/mob/living/carbon/xenomorph/xeno_owner = owner
if(steps_to_take <= 0 || xeno_owner.wrath_stored < ability_cost)
if(LinkBlocked(owner_turf, direct_turf))
- playsound(direct_turf, 'sound/effects/behemoth/behemoth_stomp.ogg', 40, TRUE)
+ playsound(direct_turf, 'sound/effects/alien/behemoth/stomp.ogg', 40, TRUE)
xeno_owner.do_attack_animation(direct_turf)
new /obj/effect/temp_visual/behemoth/crack/landslide(get_turf(owner), direction, pick(1, 2))
end_charge()
@@ -500,7 +500,7 @@
if(!living_target.lying_angle)
living_target.Knockdown(LANDSLIDE_KNOCKDOWN_DURATION)
new /obj/effect/temp_visual/behemoth/landslide/hit(get_turf(living_target))
- playsound(living_target, 'sound/effects/behemoth/landslide_hit_mob.ogg', 30, TRUE)
+ playsound(living_target, 'sound/effects/alien/behemoth/landslide_hit_mob.ogg', 30, TRUE)
living_target.emote("scream")
shake_camera(living_target, 1, 0.8)
living_target.apply_damage(damage, BRUTE, blocked = MELEE)
@@ -644,7 +644,7 @@
var/datum/action/ability/xeno_action/ready_charge/behemoth_roll/behemoth_roll_action = xeno_owner.actions_by_path[/datum/action/ability/xeno_action/ready_charge/behemoth_roll]
if(behemoth_roll_action?.charge_ability_on)
behemoth_roll_action.charge_off()
- playsound(target_turf, 'sound/effects/behemoth/behemoth_stomp.ogg', 30, TRUE)
+ playsound(target_turf, 'sound/effects/alien/behemoth/stomp.ogg', 30, TRUE)
new /obj/effect/temp_visual/behemoth/stomp/west(owner_turf, owner.dir)
new /obj/effect/temp_visual/behemoth/crack(owner_turf, owner.dir)
var/wind_up_duration = EARTH_RISER_WIND_UP
@@ -683,7 +683,7 @@
while(length(active_pillars) > maximum_pillars)
var/obj/structure/earth_pillar/oldest_pillar = popleft(active_pillars)
new /obj/effect/temp_visual/behemoth/earth_pillar/broken(oldest_pillar.loc)
- playsound(oldest_pillar.loc, 'sound/effects/behemoth/earth_pillar_destroyed.ogg', 30, TRUE)
+ playsound(oldest_pillar.loc, 'sound/effects/alien/behemoth/earth_pillar_destroyed.ogg', 30, TRUE)
qdel(oldest_pillar)
update_button_icon()
@@ -792,7 +792,7 @@ RU TGMC EDIT */
var/owner_turf = get_turf(xeno_owner)
new /obj/effect/temp_visual/behemoth/stomp/east(owner_turf, owner.dir)
new /obj/effect/temp_visual/behemoth/crack(owner_turf, owner.dir)
- playsound(target_turf, 'sound/effects/behemoth/behemoth_stomp.ogg', 30, TRUE)
+ playsound(target_turf, 'sound/effects/alien/behemoth/stomp.ogg', 30, TRUE)
var/datum/action/ability/xeno_action/primal_wrath/primal_wrath_action = xeno_owner.actions_by_path[/datum/action/ability/xeno_action/primal_wrath]
do_ability(target_turf, SEISMIC_FRACTURE_WIND_UP, primal_wrath_action?.ability_active? TRUE : FALSE)
@@ -822,7 +822,7 @@ RU TGMC EDIT */
if(!enhanced)
return
new /obj/effect/temp_visual/shockwave/enhanced(get_turf(owner), SEISMIC_FRACTURE_ATTACK_RADIUS, owner.dir)
- playsound(owner, 'sound/effects/behemoth/landslide_roar.ogg', 40, TRUE)
+ playsound(owner, 'sound/effects/alien/behemoth/landslide_roar.ogg', 40, TRUE)
var/list/turf/extra_turfs_to_warn = filled_turfs(target_turf, SEISMIC_FRACTURE_ATTACK_RADIUS_ENHANCED, bypass_window = TRUE, projectile = TRUE)
for(var/turf/extra_turf_to_warn AS in extra_turfs_to_warn)
if(isclosedturf(extra_turf_to_warn))
@@ -850,7 +850,7 @@ RU TGMC EDIT */
if(isclosedturf(target_turf))
continue
new /obj/effect/temp_visual/behemoth/crack(target_turf)
- playsound(target_turf, 'sound/effects/behemoth/seismic_fracture_explosion.ogg', 15)
+ playsound(target_turf, 'sound/effects/alien/behemoth/seismic_fracture_explosion.ogg', 15)
var/attack_vfx = enhanced? /obj/effect/temp_visual/behemoth/seismic_fracture/enhanced : /obj/effect/temp_visual/behemoth/seismic_fracture
new attack_vfx(target_turf, enhanced? FALSE : null)
for(var/atom/movable/affected_atom AS in target_turf)
@@ -894,7 +894,7 @@ RU TGMC EDIT */
affected_living.layer = initial(affected_living.layer)
var/landing_damage = (xeno_owner.xeno_caste.melee_damage * xeno_owner.xeno_melee_damage_modifier) / 2
affected_living.apply_damage(landing_damage, BRUTE, blocked = MELEE)
- //playsound(affected_living.loc, 'sound/effects/behemoth/seismic_fracture_landing.ogg', 10, TRUE)
+ //playsound(affected_living.loc, 'sound/effects/alien/behemoth/seismic_fracture_landing.ogg', 10, TRUE)
new /obj/effect/temp_visual/behemoth/stomp(affected_living.loc)
/**
@@ -1044,7 +1044,7 @@ RU TGMC EDIT */
xeno_owner.face_atom(target)
xeno_owner.set_canmove(FALSE)
var/owner_turf = get_turf(xeno_owner)
- playsound(owner_turf, 'sound/effects/behemoth/primal_wrath_roar.ogg', 75, TRUE)
+ playsound(owner_turf, 'sound/effects/alien/behemoth/primal_wrath_roar.ogg', 75, TRUE)
do_ability(owner_turf)
addtimer(CALLBACK(src, PROC_REF(end_ability)), PRIMAL_WRATH_ACTIVATION_DURATION)
succeed_activate()
@@ -1261,7 +1261,7 @@ RU TGMC EDIT */
density = TRUE
max_integrity = 200
soft_armor = list(MELEE = 25, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 0, BIO = 100, FIRE = 100, ACID = 0)
- destroy_sound = 'sound/effects/behemoth/earth_pillar_destroyed.ogg'
+ destroy_sound = 'sound/effects/alien/behemoth/earth_pillar_destroyed.ogg'
coverage = 128
/// The xeno owner of this object.
var/mob/living/carbon/xenomorph/xeno_owner
@@ -1282,7 +1282,7 @@ RU TGMC EDIT */
animate(src, pixel_x = random_x, pixel_y = 500, time = 0)
animate(pixel_x = 0, pixel_y = 0, time = 0.5 SECONDS)
return
- playsound(src, 'sound/effects/behemoth/earth_pillar_rising.ogg', 40, TRUE)
+ playsound(src, 'sound/effects/alien/behemoth/earth_pillar_rising.ogg', 40, TRUE)
particle_holder = new(src, /particles/earth_pillar)
particle_holder.pixel_y = -4
animate(particle_holder, pixel_y = 4, time = 1.0 SECONDS)
@@ -1292,7 +1292,7 @@ RU TGMC EDIT */
RegisterSignals(src, list(COMSIG_ATOM_BULLET_ACT, COMSIG_ATOM_ATTACK_HAND, COMSIG_ATOM_ATTACK_HAND_ALTERNATE, COMSIG_ATOM_ATTACKBY), PROC_REF(call_update_icon_state))
/obj/structure/earth_pillar/Destroy()
- playsound(loc, 'sound/effects/behemoth/earth_pillar_destroyed.ogg', 40, TRUE)
+ playsound(loc, 'sound/effects/alien/behemoth/earth_pillar_destroyed.ogg', 40, TRUE)
new /obj/effect/temp_visual/behemoth/earth_pillar/broken(loc)
var/datum/action/ability/activable/xeno/earth_riser/earth_riser_action = xeno_owner?.actions_by_path[/datum/action/ability/activable/xeno/earth_riser]
if(earth_riser_action && (src in earth_riser_action.active_pillars))
@@ -1346,7 +1346,7 @@ RU TGMC EDIT */
if(isxenobehemoth(xeno_user))
xeno_user.do_attack_animation(src)
do_jitter_animation(jitter_loops = 1)
- playsound(src, 'sound/effects/behemoth/earth_pillar_eating.ogg', 30, TRUE)
+ playsound(src, 'sound/effects/alien/behemoth/earth_pillar_eating.ogg', 30, TRUE)
xeno_user.visible_message(span_xenowarning("\The [xeno_user] eats away at the [src.name]!"), \
span_xenonotice(pick(
"We eat away at the stone. It tastes good, as expected of our primary diet.",
@@ -1446,11 +1446,11 @@ RU TGMC EDIT */
/// VFX + SFX for when the rock doesn't hit anything.
/datum/ammo/xeno/earth_pillar/proc/rock_broke(turf/hit_turf, obj/projectile/proj)
new /obj/effect/temp_visual/behemoth/earth_pillar/broken(hit_turf)
- playsound(hit_turf, 'sound/effects/behemoth/earth_pillar_destroyed.ogg', 30, TRUE)
+ playsound(hit_turf, 'sound/effects/alien/behemoth/earth_pillar_destroyed.ogg', 30, TRUE)
/// Does some stuff if the rock DOES hit something.
/datum/ammo/xeno/earth_pillar/proc/on_hit_anything(turf/hit_turf, obj/projectile/proj)
- playsound(hit_turf, 'sound/effects/behemoth/earth_pillar_destroyed.ogg', 40, TRUE)
+ playsound(hit_turf, 'sound/effects/alien/behemoth/earth_pillar_destroyed.ogg', 40, TRUE)
new /obj/effect/temp_visual/behemoth/earth_pillar/destroyed(hit_turf)
var/list/turf/affected_turfs = filled_turfs(hit_turf, EARTH_PILLAR_SPREAD_RADIUS, include_edge = FALSE, bypass_window = TRUE, projectile = TRUE)
behemoth_area_attack(proj.firer, affected_turfs, damage_multiplier = EARTH_PILLAR_SPREAD_DAMAGE_MULTIPLIER)
@@ -1488,7 +1488,7 @@ RU TGMC EDIT */
if(isclosedturf(affected_turf))
continue
new /obj/effect/temp_visual/behemoth/crack(affected_turf)
- playsound(affected_turf, 'sound/effects/behemoth/seismic_fracture_explosion.ogg', 15)
+ playsound(affected_turf, 'sound/effects/alien/behemoth/seismic_fracture_explosion.ogg', 15)
var/attack_vfx = enhanced? /obj/effect/temp_visual/behemoth/seismic_fracture/enhanced : /obj/effect/temp_visual/behemoth/seismic_fracture
new attack_vfx(affected_turf, enhanced? FALSE : null)
for(var/atom/movable/affected_atom AS in affected_turf)
@@ -1537,7 +1537,7 @@ RU TGMC EDIT */
var/warning_type = primal_wrath_action?.ability_active? /obj/effect/temp_visual/behemoth/warning/enhanced : /obj/effect/temp_visual/behemoth/warning
for(var/turf/target_turf AS in target_turfs)
new warning_type(target_turf, duration)
- playsound(target_turf, 'sound/effects/behemoth/behemoth_rumble.ogg', 15, TRUE)
+ playsound(target_turf, 'sound/effects/alien/behemoth/rumble.ogg', 15, TRUE)
for(var/mob/living/target_living in target_turf)
if(xeno_owner.issamexenohive(target_living) || target_living.stat == DEAD || CHECK_BITFIELD(target_living.status_flags, INCORPOREAL|GODMODE))
continue
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm
index 1f5609a01c7..97b685426bd 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/carrier/abilities_carrier.dm
@@ -99,7 +99,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list(
F.kill_hugger()
huggers++
if(message)
- playsound(src, 'sound/voice/alien_drool2.ogg', 50, 0, 1)
+ playsound(src, 'sound/voice/alien/drool2.ogg', 50, 0, 1)
to_chat(src, span_notice("We salvage this young one's biomass to produce another. Now sheltering: [huggers] / [xeno_caste.huggers_max]."))
else if(message)
to_chat(src, span_warning("We can't carry any more facehuggers!"))
@@ -161,7 +161,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list(
/datum/action/ability/xeno_action/spawn_hugger/on_cooldown_finish()
to_chat(owner, span_xenodanger("We can now spawn another young one."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/xeno_action/spawn_hugger/can_use_action(silent = FALSE, override_flags)
@@ -179,7 +179,7 @@ GLOBAL_LIST_INIT(hugger_images_list, list(
caster.huggers++
to_chat(caster, span_xenowarning("We spawn a young one via the miracle of asexual internal reproduction, adding it to our stores. Now sheltering: [caster.huggers] / [caster.xeno_caste.huggers_max]."))
- playsound(caster, 'sound/voice/alien_drool2.ogg', 50, 0, 1)
+ playsound(caster, 'sound/voice/alien/drool2.ogg', 50, 0, 1)
succeed_activate()
add_cooldown()
if(owner.client)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/chimera/abilities_chimera.dm b/code/modules/mob/living/carbon/xenomorph/castes/chimera/abilities_chimera.dm
index 5441f19947d..0646419751e 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/chimera/abilities_chimera.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/chimera/abilities_chimera.dm
@@ -141,7 +141,7 @@
/datum/action/ability/activable/xeno/blink/on_cooldown_finish()
to_chat(owner, span_xenodanger("We are able to blink again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
///Return TRUE if we have a block, return FALSE otherwise
@@ -191,7 +191,7 @@
/datum/action/ability/xeno_action/phantom/on_cooldown_finish()
to_chat(owner, span_xenodanger("We gather enough strength to create a new phantom."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/xeno_action/phantom/action_activate()
@@ -268,7 +268,7 @@
/datum/action/ability/activable/xeno/pounce/abduction/on_cooldown_finish()
to_chat(owner, span_xenodanger("We gather enough strength to abduct another one."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/activable/xeno/pounce/abduction/use_ability(atom/A)
@@ -343,7 +343,7 @@
/datum/action/ability/activable/xeno/body_swap/on_cooldown_finish()
to_chat(owner, span_xenodanger("We gather enough strength to perform body swap again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/activable/xeno/body_swap/use_ability(atom/A)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm b/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm
index e100992c86f..2dea79212b5 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/crusher/abilities_crusher.dm
@@ -80,7 +80,7 @@
/datum/action/ability/activable/xeno/cresttoss/on_cooldown_finish()
var/mob/living/carbon/xenomorph/X = owner
to_chat(X, span_xenowarning("We can now crest toss again."))
- playsound(X, 'sound/effects/xeno_newlarva.ogg', 50, 0, 1)
+ playsound(X, 'sound/effects/alien/newlarva.ogg', 50, 0, 1)
return ..()
/datum/action/ability/activable/xeno/cresttoss/can_use_ability(atom/A, silent = FALSE, override_flags)
@@ -198,7 +198,7 @@
/datum/action/ability/activable/xeno/advance/on_cooldown_finish()
to_chat(owner, span_xenowarning("We can now rapidly charge forward again."))
- playsound(owner, 'sound/effects/xeno_newlarva.ogg', 50, 0, 1)
+ playsound(owner, 'sound/effects/alien/newlarva.ogg', 50, 0, 1)
return ..()
/datum/action/ability/activable/xeno/advance/can_use_ability(atom/A, silent = FALSE, override_flags)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm b/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm
index a6e2b090c25..81833f6b757 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/defender/abilities_defender.dm
@@ -31,7 +31,7 @@
X.add_filter("defender_tail_sweep", 2, gauss_blur_filter(1)) //Add cool SFX
X.spin(4, 1)
X.enable_throw_parry(0.6 SECONDS)
- playsound(X,pick('sound/effects/alien_tail_swipe1.ogg','sound/effects/alien_tail_swipe2.ogg','sound/effects/alien_tail_swipe3.ogg'), 25, 1) //Sound effects
+ playsound(X,pick('sound/effects/alien/tail_swipe1.ogg','sound/effects/alien/tail_swipe2.ogg','sound/effects/alien/tail_swipe3.ogg'), 25, 1) //Sound effects
var/sweep_range = 1
var/list/L = orange(sweep_range, X) // Not actually the fruit
@@ -70,7 +70,7 @@
/datum/action/ability/xeno_action/tail_sweep/on_cooldown_finish()
var/mob/living/carbon/xenomorph/X = owner
to_chat(X, span_notice("We gather enough strength to tail sweep again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/xeno_action/tail_sweep/ai_should_start_consider()
@@ -416,7 +416,7 @@
var/mob/living/carbon/xenomorph/X = owner
X.spin(4, 1)
X.enable_throw_parry(0.6 SECONDS)
- playsound(X, pick('sound/effects/alien_tail_swipe1.ogg','sound/effects/alien_tail_swipe2.ogg','sound/effects/alien_tail_swipe3.ogg'), 25, 1) //Sound effects
+ playsound(X, pick('sound/effects/alien/tail_swipe1.ogg','sound/effects/alien/tail_swipe2.ogg','sound/effects/alien/tail_swipe3.ogg'), 25, 1) //Sound effects
for(var/mob/living/carbon/human/slapped in orange(1, X))
if(slapped.stat == DEAD)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm b/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm
index a586d21b313..d953ae64b10 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/defiler/abilities_defiler.dm
@@ -73,7 +73,7 @@
)
/datum/action/ability/activable/xeno/defile/on_cooldown_finish()
- playsound(owner.loc, 'sound/voice/alien_drool1.ogg', 50, 1)
+ playsound(owner.loc, 'sound/voice/alien/drool1.ogg', 50, 1)
to_chat(owner, span_xenodanger("You feel your toxin accelerant glands refill. You can use Defile again."))
return ..()
@@ -110,7 +110,7 @@
X.face_atom(living_target)
X.do_attack_animation(living_target)
playsound(living_target, 'sound/effects/spray3.ogg', 15, TRUE)
- playsound(living_target, pick('sound/voice/alien_drool1.ogg', 'sound/voice/alien_drool2.ogg'), 15, 1)
+ playsound(living_target, pick('sound/voice/alien/drool1.ogg', 'sound/voice/alien/drool2.ogg'), 15, 1)
to_chat(X, span_xenodanger("Our stinger successfully discharges accelerant into our victim."))
to_chat(living_target, span_danger("You feel horrible pain as something sharp forcibly pierces your thorax."))
living_target.apply_damage(50, STAMINA)
@@ -176,7 +176,7 @@
var/obj/effect/abstract/particle_holder/particle_holder
/datum/action/ability/xeno_action/emit_neurogas/on_cooldown_finish()
- playsound(owner.loc, 'sound/effects/xeno_newlarva.ogg', 50, 0)
+ playsound(owner.loc, 'sound/effects/alien/newlarva.ogg', 50, 0)
to_chat(owner, span_xenodanger("We feel our dorsal vents bristle with heated gas. We can emit Noxious Gas again."))
return ..()
@@ -301,7 +301,7 @@
)
/datum/action/ability/activable/xeno/inject_egg_neurogas/on_cooldown_finish()
- playsound(owner.loc, 'sound/effects/xeno_newlarva.ogg', 50, 0)
+ playsound(owner.loc, 'sound/effects/alien/newlarva.ogg', 50, 0)
to_chat(owner, span_xenodanger("We feel our stinger fill with toxins. We can inject an egg with gas again."))
return ..()
@@ -456,7 +456,7 @@
reagent_slash_reagent = X.selected_reagent
X.balloon_alert(X, "Reagent slash active") //Let the user know
- X.playsound_local(X, 'sound/voice/alien_drool2.ogg', 25)
+ X.playsound_local(X, 'sound/voice/alien/drool2.ogg', 25)
toggle_particles(TRUE)
succeed_activate()
@@ -473,7 +473,7 @@
toggle_particles(FALSE)
X.balloon_alert(X, "Reagent slash over") //Let the user know
- X.playsound_local(X, 'sound/voice/hiss5.ogg', 25)
+ X.playsound_local(X, 'sound/voice/alien/hiss8.ogg', 25)
///Called when we slash while reagent slash is active
@@ -513,7 +513,7 @@
/datum/action/ability/xeno_action/reagent_slash/on_cooldown_finish()
to_chat(owner, span_xenodanger("We are able to infuse our spines with toxins again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
// Toggles particles on or off, depending on the defined var.
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/facehugger/abilities_facehugger.dm b/code/modules/mob/living/carbon/xenomorph/castes/facehugger/abilities_facehugger.dm
index 1bed20235ac..710de6df33d 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/facehugger/abilities_facehugger.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/facehugger/abilities_facehugger.dm
@@ -47,7 +47,7 @@
var/mob/living/carbon/xenomorph/facehugger/caster = owner
caster.visible_message(span_danger("[caster] leaps on [living_target]!"), span_xenodanger("We leap on [living_target]!"), null, 5)
- playsound(caster.loc, 'sound/voice/alien_roar_larva3.ogg', 25, TRUE) //TODO: I NEED ACTUAL HUGGERS SOUND DAMMED
+ playsound(caster.loc, 'sound/voice/alien/larva/roar3.ogg', 25, TRUE) //TODO: I NEED ACTUAL HUGGERS SOUND DAMMED
if(ishuman(living_target) && (angle_to_dir(Get_Angle(caster.throw_source, living_target)) in reverse_nearby_direction(living_target.dir)))
var/mob/living/carbon/human/human_target = living_target
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm
index 7ce164dfeb2..43242153c28 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/hivelord/abilities_hivelord.dm
@@ -53,7 +53,7 @@
recycled_xeno.gib()
- playsound(hivelord, 'sound/effects/alien_recycler.ogg', 40)
+ playsound(hivelord, 'sound/effects/alien/recycler.ogg', 40)
hivelord.visible_message(span_xenowarning("\The [hivelord] brushes xenomorphs' bits off its claws."), \
span_danger("We brush xenomorphs' bits off of our claws."), null, 20)
return succeed_activate() //dew it
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm
index c71a6865c7b..bcc61d546f9 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/hivemind/hivemind.dm
@@ -404,7 +404,7 @@
return
to_chat(get_parent(), span_xenoannounce("Our [src.name] has detected a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y])."))
- SEND_SOUND(get_parent(), 'sound/voice/alien_help1.ogg')
+ SEND_SOUND(get_parent(), 'sound/voice/alien/help1.ogg')
COOLDOWN_START(src, hivemind_proxy_alert_cooldown, XENO_HIVEMIND_DETECTION_COOLDOWN) //set the cooldown.
/// Getter for the parent of this hive core
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm b/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm
index ce9c339e5af..b42f00153fe 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/hunter/abilities_hunter.dm
@@ -34,7 +34,7 @@
/datum/action/ability/xeno_action/stealth/on_cooldown_finish()
owner.balloon_alert(owner, "Stealth ready.")
- playsound(owner, "sound/effects/xeno_newlarva.ogg", 25, 0, 1)
+ playsound(owner, "sound/effects/alien/newlarva.ogg", 25, 0, 1)
return ..()
/datum/action/ability/xeno_action/stealth/action_activate()
@@ -113,7 +113,7 @@
return
can_sneak_attack = TRUE
owner.balloon_alert(owner, "Sneak Attack ready.")
- playsound(owner, "sound/effects/xeno_newlarva.ogg", 25, 0, 1)
+ playsound(owner, "sound/effects/alien/newlarva.ogg", 25, 0, 1)
/datum/action/ability/xeno_action/stealth/process()
if(!stealth)
@@ -306,7 +306,7 @@
/datum/action/ability/activable/xeno/pounce/on_cooldown_finish()
owner.balloon_alert(owner, "Pounce ready")
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/activable/xeno/pounce/can_use_ability(atom/A, silent = FALSE, override_flags)
@@ -364,7 +364,7 @@
///Triggers the effect of a successful pounce on the target.
/datum/action/ability/activable/xeno/pounce/proc/trigger_pounce_effect(mob/living/living_target)
- playsound(get_turf(living_target), 'sound/voice/alien_pounce.ogg', 25, TRUE)
+ playsound(get_turf(living_target), 'sound/voice/alien/pounce.ogg', 25, TRUE)
var/mob/living/carbon/xenomorph/xeno_owner = owner
xeno_owner.set_throwing(FALSE)
xeno_owner.Immobilize(XENO_POUNCE_STANDBY_DURATION)
@@ -459,7 +459,7 @@
/datum/action/ability/activable/xeno/hunter_mark/on_cooldown_finish()
to_chat(owner, span_xenowarning("We are able to impose our psychic mark again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
@@ -713,7 +713,7 @@
/datum/action/ability/activable/xeno/silence/on_cooldown_finish()
to_chat(owner, span_xenowarning("We refocus our psionic energies, allowing us to impose silence again.") )
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
cooldown_duration = initial(cooldown_duration) //Reset the cooldown timer to its initial state in the event of a whiffed Silence.
return ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm
index 3961e9b8321..0b9f61c541c 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/king/abilities_king.dm
@@ -204,7 +204,7 @@
return
owner.dir = get_cardinal_dir(owner, target)
- playsound(owner, 'sound/voice/ed209_20sec.ogg', 70, sound_range = 20)
+ playsound(owner, 'sound/voice/alien/king_roar.ogg', 70, sound_range = 20)
var/mob/living/carbon/xenomorph/king/king_owner = owner
if(istype(king_owner))
king_owner.icon_state = "King Screeching"
@@ -218,7 +218,7 @@
return fail_activate()
finish_charging()
- playsound(owner, 'sound/voice/xenos_roaring.ogg', 90, sound_range = 30)
+ playsound(owner, 'sound/voice/alien/xenos_roaring.ogg', 90, sound_range = 30)
for(var/mob/living/carbon/human/human_victim AS in GLOB.humans_by_zlevel["[owner.z]"])
if(get_dist(human_victim, owner) > 9)
continue
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm b/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm
index 811fc690c55..6b3ce27b5ce 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/king/king.dm
@@ -24,7 +24,7 @@
/mob/living/carbon/xenomorph/king/Initialize(mapload)
. = ..()
- playsound(loc, 'sound/voice/xenos_roaring.ogg', 75, 0)
+ playsound(loc, 'sound/voice/alien/xenos_roaring.ogg', 75, 0)
/mob/living/carbon/xenomorph/king/generate_name()
var/playtime_mins = client?.get_exp(xeno_caste.caste_name)
@@ -48,4 +48,4 @@
mind.name = name
/mob/living/carbon/xenomorph/king/death_cry()
- playsound(loc, 'sound/voice/alien_king_died.ogg', 75, 0)
+ playsound(loc, 'sound/voice/alien/king_died.ogg', 75, 0)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm b/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm
index 49461bc044f..d2cd95efa17 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/panther/abilities_panther.dm
@@ -38,7 +38,7 @@
xenomorph_owner.add_filter("defender_tail_sweep", 2, gauss_blur_filter(1)) //Add cool SFX
xenomorph_owner.spin(4, 1)
xenomorph_owner.enable_throw_parry(0.6 SECONDS)
- playsound(xenomorph_owner,pick('sound/effects/alien_tail_swipe1.ogg','sound/effects/alien_tail_swipe2.ogg','sound/effects/alien_tail_swipe3.ogg'), 25, 1) //Sound effects
+ playsound(xenomorph_owner,pick('sound/effects/alien/tail_swipe1.ogg','sound/effects/alien/tail_swipe2.ogg','sound/effects/alien/tail_swipe3.ogg'), 25, 1) //Sound effects
var/sweep_range = 1
var/list/L = orange(sweep_range, xenomorph_owner) // Not actually the fruit
@@ -69,7 +69,7 @@
/datum/action/ability/xeno_action/tearingtail/on_cooldown_finish()
var/mob/living/carbon/xenomorph/xenomorph_owner = owner
to_chat(xenomorph_owner, span_notice("We gather enough strength to tear the skin again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
///////////////////////////////////
@@ -93,7 +93,7 @@
/datum/action/ability/activable/xeno/adrenalinejump/on_cooldown_finish()
to_chat(owner, span_xenodanger("We ready ourselves to jump again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/activable/xeno/adrenalinejump/can_use_ability(atom/A, silent = FALSE, override_flags)
@@ -391,13 +391,13 @@
evade_active = FALSE //Evasion is no longer active
owner.balloon_alert(owner, "Evasion ended")
- owner.playsound_local(owner, 'sound/voice/hiss5.ogg', 50)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 50)
#define PANTHER_EVASION_RUN_DELAY 0.5 SECONDS // If the time since the Runner last moved is equal to or greater than this, its Evasion ends.
/datum/action/ability/xeno_action/evasive_maneuvers/on_cooldown_finish()
to_chat(owner, span_xenodanger("We are able to take evasive action again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
@@ -455,7 +455,7 @@
xenomorph_owner.do_jitter_animation(4000)
var/turf/our_turf = get_turf(xenomorph_owner) //location of after image SFX
- playsound(our_turf, pick('sound/effects/throw.ogg','sound/effects/alien_tail_swipe1.ogg', 'sound/effects/alien_tail_swipe2.ogg'), 25, 1) //sound effects
+ playsound(our_turf, pick('sound/effects/throw.ogg','sound/effects/alien/tail_swipe1.ogg', 'sound/effects/alien/tail_swipe2.ogg'), 25, 1) //sound effects
var/obj/effect/temp_visual/xenomorph/afterimage/our_afterimage
for(var/i = 0 to 2) //number of after images
our_afterimage = new /obj/effect/temp_visual/xenomorph/afterimage(our_turf, owner) //Create the after image.
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm
index 70e47599d0b..f2eb176f0a7 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/praetorian/abilities_praetorian.dm
@@ -37,7 +37,7 @@
/datum/action/ability/activable/xeno/scatter_spit/on_cooldown_finish()
to_chat(owner, span_xenodanger("Our auxiliary sacks fill to bursting; we can use scatter spit again."))
- owner.playsound_local(owner, 'sound/voice/alien_drool1.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/drool1.ogg', 25, 0, 1)
return ..()
// ***************************************
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/predalien/abilities_predalien.dm b/code/modules/mob/living/carbon/xenomorph/castes/predalien/abilities_predalien.dm
index 25bfe60f699..de0646270f2 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/predalien/abilities_predalien.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/predalien/abilities_predalien.dm
@@ -19,7 +19,7 @@
///Triggers the effect of a successful pounce on the target.
/datum/action/ability/activable/xeno/pounce/predalien/trigger_pounce_effect(mob/living/living_target)
- playsound(get_turf(living_target), 'sound/voice/predalien_pounce.ogg', 25, TRUE)
+ playsound(get_turf(living_target), 'sound/voice/alien/predalien/pounce.ogg', 25, TRUE)
var/mob/living/carbon/xenomorph/xeno_owner = owner
xeno_owner.set_throwing(FALSE)
xeno_owner.Immobilize(XENO_POUNCE_STANDBY_DURATION)
@@ -40,7 +40,7 @@
cooldown_duration = 25 SECONDS
ability_cost = 50
- var/predalien_roar = list("sound/voice/predalien_roar.ogg")
+ var/predalien_roar = list("sound/voice/alien/predalien/roar.ogg")
var/bonus_damage_scale = 2.5
var/bonus_speed_scale = 0.05
@@ -90,7 +90,7 @@
ability_cost = 80
var/freeze_duration = 1.5 SECONDS
- var/smash_sounds = list('sound/effects/alien_footstep_charge1.ogg', 'sound/effects/alien_footstep_charge2.ogg', 'sound/effects/alien_footstep_charge3.ogg')
+ var/smash_sounds = list('sound/effects/footstep/alien/charge1.ogg', 'sound/effects/footstep/alien/charge2.ogg', 'sound/effects/footstep/alien/charge3.ogg')
/datum/action/ability/activable/xeno/smash/can_use_ability(atom/target, silent = FALSE, override_flags)
. = ..()
@@ -196,7 +196,7 @@
xeno.setDir(turn(xeno.dir, 90))
xeno.do_attack_animation(carbon, ATTACK_EFFECT_BITE)
- playsound(xeno, 'sound/voice/predalien_growl.ogg', 75, 0)
+ playsound(xeno, 'sound/voice/alien/predalien/growl.ogg', 75, 0)
xeno.anchored = FALSE
xeno.SetImmobilized(0)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm
index 03580ce55a5..eafdf370085 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/queen/abilities_queen.dm
@@ -37,7 +37,7 @@
var/queens_word = "HIVE MESSAGE:
" + input
var/sound/queen_sound = sound(get_sfx("queen"), channel = CHANNEL_ANNOUNCEMENTS)
- var/sound/king_sound = sound('sound/voice/xenos_roaring.ogg', channel = CHANNEL_ANNOUNCEMENTS)
+ var/sound/king_sound = sound('sound/voice/alien/xenos_roaring.ogg', channel = CHANNEL_ANNOUNCEMENTS)
for(var/mob/living/carbon/xenomorph/X AS in Q.hive.get_all_xenos())
switch(Q.caste_base_type)
if(/mob/living/carbon/xenomorph/queen)
@@ -92,7 +92,7 @@
succeed_activate()
add_cooldown()
- playsound(X.loc, 'sound/voice/alien_queen_screech.ogg', 75, 0)
+ playsound(X.loc, 'sound/voice/alien/queen/screech.ogg', 75, 0)
X.visible_message(span_xenohighdanger("\The [X] emits an ear-splitting guttural roar!"))
GLOB.round_statistics.queen_screech++
SSblackbox.record_feedback("tally", "round_statistics", 1, "queen_screech")
@@ -155,7 +155,7 @@
continue
affected_xeno.apply_status_effect(/datum/status_effect/plasma_surge, affected_xeno.xeno_caste.plasma_max / 3, bonus_regen, duration)
- playsound(X.loc, 'sound/voice/alien_plasma_screech.ogg', 75, 0)
+ playsound(X.loc, 'sound/voice/alien/queen/screech_plasma.ogg', 75, 0)
X.visible_message(span_xenohighdanger("\The [X] emits an ear-splitting guttural roar!"))
succeed_activate()
@@ -188,7 +188,7 @@
for(var/mob/living/carbon/xenomorph/affected_xeno in cheap_get_xenos_near(X, screech_range))
affected_xeno.apply_status_effect(/datum/status_effect/frenzy_screech, buff_duration, buff_damage_modifier)
- playsound(X.loc, 'sound/voice/alien_frenzy_screech.ogg', 75, 0)
+ playsound(X.loc, 'sound/voice/alien/queen/screech_frenzy.ogg', 75, 0)
X.visible_message(span_xenohighdanger("\The [X] emits an ear-splitting guttural roar!"))
succeed_activate()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm b/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm
index 32ab7a3b7b2..b6b6feb4211 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/queen/queen.dm
@@ -31,7 +31,7 @@
RegisterSignal(src, COMSIG_HIVE_BECOME_RULER, PROC_REF(on_becoming_ruler))
. = ..()
hive.RegisterSignal(src, COMSIG_HIVE_XENO_DEATH, TYPE_PROC_REF(/datum/hive_status, on_queen_death))
- playsound(loc, 'sound/voice/alien_queen_command.ogg', 75, 0)
+ playsound(loc, 'sound/voice/alien/queen/command.ogg', 75, 0)
// ***************************************
// *********** Mob overrides
@@ -98,7 +98,7 @@
// *********** Death
// ***************************************
/mob/living/carbon/xenomorph/queen/death_cry()
- playsound(loc, 'sound/voice/alien_queen_died.ogg', 75, 0)
+ playsound(loc, 'sound/voice/alien/queen/died.ogg', 75, 0)
/mob/living/carbon/xenomorph/queen/xeno_death_alert()
return
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm b/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm
index aac732b46d4..5672ebd1b6e 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/ravager/abilities_ravager.dm
@@ -34,7 +34,7 @@
/datum/action/ability/activable/xeno/charge/on_cooldown_finish()
to_chat(owner, span_xenodanger("Our exoskeleton quivers as we get ready to use [name] again."))
- playsound(owner, "sound/effects/xeno_newlarva.ogg", 50, 0, 1)
+ playsound(owner, "sound/effects/alien/newlarva.ogg", 50, 0, 1)
return ..()
/datum/action/ability/activable/xeno/charge/ai_should_start_consider()
@@ -105,7 +105,7 @@
/datum/action/ability/activable/xeno/ravage/on_cooldown_finish()
to_chat(owner, span_xenodanger("We gather enough strength to Ravage again."))
- playsound(owner, "sound/effects/xeno_newlarva.ogg", 50, 0, 1)
+ playsound(owner, "sound/effects/alien/newlarva.ogg", 50, 0, 1)
return ..()
/datum/action/ability/activable/xeno/ravage/use_ability(atom/A)
@@ -209,7 +209,7 @@
/datum/action/ability/xeno_action/endure/on_cooldown_finish()
to_chat(owner, span_xenodanger("We feel able to imbue ourselves with plasma to Endure once again!"))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/xeno_action/endure/action_activate()
@@ -246,7 +246,7 @@
if(QDELETED(owner))
return
to_chat(owner,span_highdanger("We feel the plasma draining from our veins... [initial(name)] will last for only [timeleft(endure_duration) * 0.1] more seconds!"))
- owner.playsound_local(owner, 'sound/voice/hiss4.ogg', 50, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 50, 0, 1)
///Turns off the Endure buff
/datum/action/ability/xeno_action/endure/proc/endure_deactivate()
@@ -276,7 +276,7 @@
endure_warning_duration = initial(endure_warning_duration)
to_chat(owner,span_highdanger("The last of the plasma drains from our body... We can no longer endure beyond our normal limits!"))
- owner.playsound_local(owner, 'sound/voice/hiss4.ogg', 50, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 50, 0, 1)
///Warns us when our health is critically low and tells us exactly how much more punishment we can take
/datum/action/ability/xeno_action/endure/proc/damage_taken(mob/living/carbon/xenomorph/X, damage_taken)
@@ -326,7 +326,7 @@
/datum/action/ability/xeno_action/rage/on_cooldown_finish()
to_chat(owner, span_xenodanger("We are able to enter our rage once again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
/datum/action/ability/xeno_action/rage/can_use_action(atom/A, silent = FALSE, override_flags)
@@ -359,7 +359,7 @@
//Roar SFX; volume scales with rage
- playsound(X.loc, 'sound/voice/alien_roar2.ogg', clamp(100 * rage_power, 25, 80), 0)
+ playsound(X.loc, 'sound/voice/alien/roar2.ogg', clamp(100 * rage_power, 25, 80), 0)
var/bonus_duration
if(rage_power >= RAVAGER_RAGE_SUPER_RAGE_THRESHOLD) //If we're super pissed it's time to get crazy
@@ -428,7 +428,7 @@ RU TGMC EDIT */
if(QDELETED(owner))
return
to_chat(owner,span_highdanger("Our rage begins to subside... [initial(name)] will only last for only [(RAVAGER_RAGE_DURATION + bonus_duration) * (1-RAVAGER_RAGE_WARNING) * 0.1] more seconds!"))
- owner.playsound_local(owner, 'sound/voice/hiss4.ogg', 50, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 50, 0, 1)
///Warns the user when his rage is about to end.
/datum/action/ability/xeno_action/rage/proc/drain_slash(datum/source, mob/living/target, damage, list/damage_mod, list/armor_mod)
@@ -482,7 +482,7 @@ RU TGMC EDIT */
//rage_sunder = 0 //RU TGMC EDIT
rage_power = 0
rage_plasma = 0
- X.playsound_local(X, 'sound/voice/hiss5.ogg', 50) //Audio cue
+ X.playsound_local(X, 'sound/voice/alien/hiss8.ogg', 50) //Audio cue
// ***************************************
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm
index 5c899221807..d5c71092b96 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/runner/abilities_runner.dm
@@ -61,7 +61,7 @@
if(COOLDOWN_CHECK(src, savage_cooldown))
button.cut_overlay(visual_references[VREF_MUTABLE_SAVAGE_COOLDOWN])
owner.balloon_alert(owner, "Savage ready")
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
STOP_PROCESSING(SSprocessing, src)
return
button.cut_overlay(visual_references[VREF_MUTABLE_SAVAGE_COOLDOWN])
@@ -101,7 +101,7 @@
/datum/action/ability/xeno_action/evasion/on_cooldown_finish()
. = ..()
owner.balloon_alert(owner, "Evasion ready")
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
/datum/action/ability/xeno_action/evasion/can_use_action(silent = FALSE, override_flags)
. = ..()
@@ -195,7 +195,7 @@
evasion_stacks = 0
evasion_duration = 0
owner.balloon_alert(owner, "Evasion ended")
- owner.playsound_local(owner, 'sound/voice/hiss5.ogg', 50)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 50)
var/mob/living/carbon/xenomorph/runner/runner_owner = owner
runner_owner.hud_set_evasion(evasion_duration)
@@ -245,7 +245,7 @@
if(auto_evasion && xeno_owner.plasma_stored >= ability_cost)
action_activate()
var/turf/current_turf = get_turf(xeno_owner) //location of after image SFX
- playsound(current_turf, pick('sound/effects/throw.ogg','sound/effects/alien_tail_swipe1.ogg', 'sound/effects/alien_tail_swipe2.ogg'), 25, 1) //sound effects
+ playsound(current_turf, pick('sound/effects/throw.ogg','sound/effects/alien/tail_swipe1.ogg', 'sound/effects/alien/tail_swipe2.ogg'), 25, 1) //sound effects
var/obj/effect/temp_visual/xenomorph/afterimage/after_image
for(var/i=0 to 2) //number of after images
after_image = new /obj/effect/temp_visual/xenomorph/afterimage(current_turf, owner) //Create the after image.
@@ -329,7 +329,7 @@
if(!stolen_item)
victim.balloon_alert(owner, "Snatch failed, no item")
return fail_activate()
- playsound(owner, 'sound/voice/alien_pounce2.ogg', 30)
+ playsound(owner, 'sound/voice/alien/pounce2.ogg', 30)
victim.dropItemToGround(stolen_item, TRUE)
stolen_item.forceMove(owner)
stolen_appearance = mutable_appearance(stolen_item.icon, stolen_item.icon_state)
@@ -382,6 +382,6 @@
stolen_item.forceMove(get_turf(owner))
stolen_item = null
owner.overlays -= stolen_appearance
- playsound(owner, 'sound/voice/alien_pounce2.ogg', 30, frequency = -1)
+ playsound(owner, 'sound/voice/alien/pounce2.ogg', 30, frequency = -1)
UnregisterSignal(owner, COMSIG_ATOM_DIR_CHANGE)
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm
index 929fe567b5e..74f50fe83f4 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/sentinel/abilities_sentinel.dm
@@ -60,7 +60,7 @@
ability_duration = addtimer(CALLBACK(src, PROC_REF(toxic_slash_deactivate), xeno_owner), SENTINEL_TOXIC_SLASH_DURATION, TIMER_STOPPABLE) //Initiate the timer and set the timer ID for reference
RegisterSignal(xeno_owner, COMSIG_XENOMORPH_ATTACK_LIVING, PROC_REF(toxic_slash))
xeno_owner.balloon_alert(xeno_owner, "Toxic Slash active")
- xeno_owner.playsound_local(xeno_owner, 'sound/voice/alien_drool2.ogg', 25)
+ xeno_owner.playsound_local(xeno_owner, 'sound/voice/alien/drool2.ogg', 25)
action_icon_state = "neuroclaws_on"
particle_holder = new(owner, /particles/toxic_slash)
particle_holder.pixel_x = 9
@@ -93,11 +93,11 @@
ability_duration = null
QDEL_NULL(particle_holder)
xeno_owner.balloon_alert(xeno_owner, "Toxic Slash over") //Let the user know
- xeno_owner.playsound_local(xeno_owner, 'sound/voice/hiss5.ogg', 25)
+ xeno_owner.playsound_local(xeno_owner, 'sound/voice/alien/hiss8.ogg', 25)
action_icon_state = "neuroclaws_off"
/datum/action/ability/xeno_action/toxic_slash/on_cooldown_finish()
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
owner.balloon_alert(owner, "Toxic Slash ready")
return ..()
@@ -168,7 +168,7 @@
HEAL_XENO_DAMAGE(xeno_owner, drain_potency, FALSE)
xeno_owner.gain_plasma(drain_potency * 3.5)
xeno_owner.do_attack_animation(xeno_target, ATTACK_EFFECT_DRAIN_STING)
- playsound(owner.loc, 'sound/effects/alien_tail_swipe1.ogg', 30)
+ playsound(owner.loc, 'sound/effects/alien/tail_swipe1.ogg', 30)
xeno_owner.visible_message(message = span_xenowarning("\A [xeno_owner] stings [xeno_target]!"), self_message = span_xenowarning("We sting [xeno_target]!"))
debuff.stacks -= round(debuff.stacks * 0.7)
succeed_activate()
@@ -177,7 +177,7 @@
SSblackbox.record_feedback("tally", "round_statistics", 1, "sentinel_drain_stings")
/datum/action/ability/activable/xeno/drain_sting/on_cooldown_finish()
- playsound(owner.loc, 'sound/voice/alien_drool1.ogg', 50, 1)
+ playsound(owner.loc, 'sound/voice/alien/drool1.ogg', 50, 1)
owner.balloon_alert(owner, "Drain Sting ready")
return ..()
@@ -220,7 +220,7 @@
smoke_duration = 4
dangerous = TRUE
smoketype = /datum/effect_system/smoke_spread/xeno/toxic
- arm_sound = 'sound/voice/alien_yell_alt.ogg'
+ arm_sound = 'sound/voice/alien/yell_alt.ogg'
smokeradius = 3
/obj/item/explosive/grenade/smokebomb/xeno/update_overlays()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm b/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm
index 22cdd0196ad..f74cdbcb04c 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/spitter/abilities_spitter.dm
@@ -94,7 +94,7 @@
/datum/action/ability/activable/xeno/spray_acid/line/on_cooldown_finish() //Give acid spray a proper cooldown notification
to_chat(owner, span_xenodanger("Our dermal pouches bloat with fresh acid; we can use acid spray again."))
- owner.playsound_local(owner, 'sound/voice/alien_drool2.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/drool2.ogg', 25, 0, 1)
return ..()
// ***************************************
@@ -135,5 +135,5 @@
/datum/action/ability/activable/xeno/scatter_spit/on_cooldown_finish()
to_chat(owner, span_xenodanger("Our auxiliary sacks fill to bursting; we can use scatter spit again."))
- owner.playsound_local(owner, 'sound/voice/alien_drool1.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/drool1.ogg', 25, 0, 1)
return ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm b/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm
index 4e94675eea2..7ce5071e9b4 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/warlock/abilities_warlock.dm
@@ -172,7 +172,7 @@
affected.throw_at(throwlocation, 4, 1, owner, TRUE)
playsound(owner,'sound/effects/bamf.ogg', 75, TRUE)
- playsound(owner, 'sound/voice/alien_roar_warlock.ogg', 25)
+ playsound(owner, 'sound/voice/alien/roar_warlock.ogg', 25)
GLOB.round_statistics.psy_shield_blasts++
SSblackbox.record_feedback("tally", "round_statistics", 1, "psy_shield_blasts")
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm b/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm
index e033747fb01..06775cfa9eb 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/warrior/abilities_warrior.dm
@@ -59,7 +59,7 @@
/// Happens when Empower fades.
/datum/action/ability/xeno_action/empower/proc/empower_fade()
- owner.playsound_local(owner, 'sound/voice/hiss4.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 25, 0, 1)
clear_empower()
@@ -772,5 +772,5 @@ RU TGMC EDIT*/
/datum/action/ability/activable/xeno/warrior/punch/jab/on_cooldown_finish()
var/mob/living/carbon/xenomorph/xeno_owner = owner
xeno_owner.balloon_alert(xeno_owner, "Jab ready")
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
diff --git a/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm b/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm
index b086e6e5fb6..a85be7c090c 100644
--- a/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm
+++ b/code/modules/mob/living/carbon/xenomorph/castes/wraith/abilities_wraith.dm
@@ -147,7 +147,7 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list(
/datum/action/ability/activable/xeno/blink/on_cooldown_finish()
to_chat(owner, span_xenodanger("We are able to blink again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
// ***************************************
@@ -287,7 +287,7 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list(
return
to_chat(owner,span_highdanger("Our banishment target [banishment_target.name] is about to return to reality at [AREACOORD_NO_Z(portal)]!"))
- owner.playsound_local(owner, 'sound/voice/hiss4.ogg', 50, 0, 1)
+ owner.playsound_local(owner, 'sound/voice/alien/hiss8.ogg', 50, 0, 1)
///Ends the effect of the Banish ability
/datum/action/ability/activable/xeno/banish/proc/banish_deactivate()
@@ -338,7 +338,7 @@ GLOBAL_LIST_INIT(wraith_banish_very_short_duration_list, typecacheof(list(
/datum/action/ability/activable/xeno/banish/on_cooldown_finish()
to_chat(owner, span_xenodanger("We are able to banish again."))
- owner.playsound_local(owner, 'sound/effects/xeno_newlarva.ogg', 25, 0, 1)
+ owner.playsound_local(owner, 'sound/effects/alien/newlarva.ogg', 25, 0, 1)
return ..()
// ***************************************
diff --git a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
index 5c3457aa490..e67512fc590 100644
--- a/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/damage_procs.dm
@@ -111,7 +111,7 @@
if(X.client.prefs.mute_xeno_health_alert_messages) //Build the filter list; people who opted not to receive health alert messages
filter_list += X //Add the xeno to the filter list
- xeno_message("Our sister [name] is badly hurt with ([health]/[maxHealth]) health remaining at [AREACOORD_NO_Z(src)]!", "xenoannounce", 5, hivenumber, FALSE, src, 'sound/voice/alien_help1.ogg', TRUE, filter_list, /atom/movable/screen/arrow/silo_damaged_arrow)
+ xeno_message("Our sister [name] is badly hurt with ([health]/[maxHealth]) health remaining at [AREACOORD_NO_Z(src)]!", "xenoannounce", 5, hivenumber, FALSE, src, 'sound/voice/alien/help1.ogg', TRUE, filter_list, /atom/movable/screen/arrow/silo_damaged_arrow)
COOLDOWN_START(src, xeno_health_alert_cooldown, XENO_HEALTH_ALERT_COOLDOWN) //set the cooldown.
return damage
diff --git a/code/modules/mob/living/carbon/xenomorph/death.dm b/code/modules/mob/living/carbon/xenomorph/death.dm
index c5a7573d96a..272e1eb20aa 100644
--- a/code/modules/mob/living/carbon/xenomorph/death.dm
+++ b/code/modules/mob/living/carbon/xenomorph/death.dm
@@ -1,6 +1,6 @@
/mob/living/carbon/xenomorph/proc/death_cry()
- playsound(loc, prob(50) ? 'sound/voice/alien_death.ogg' : 'sound/voice/alien_death2.ogg', 25, 1)
+ playsound(loc, prob(50) ? 'sound/voice/alien/death.ogg' : 'sound/voice/alien/death2.ogg', 25, 1)
/mob/living/carbon/xenomorph/death(gibbing, deathmessage = "lets out a waning guttural screech, green blood bubbling from its maw.", silent)
diff --git a/code/modules/mob/living/carbon/xenomorph/egg.dm b/code/modules/mob/living/carbon/xenomorph/egg.dm
index f67ceb114ab..5caa4d308b7 100644
--- a/code/modules/mob/living/carbon/xenomorph/egg.dm
+++ b/code/modules/mob/living/carbon/xenomorph/egg.dm
@@ -116,7 +116,7 @@
advance_maturity(stage_ready_to_burst + 1)
for(var/turf/turf_to_watch AS in filled_turfs(src, trigger_size, "circle", FALSE))
UnregisterSignal(turf_to_watch, COMSIG_ATOM_ENTERED)
- playsound(loc, "sound/effects/alien_egg_move.ogg", 25)
+ playsound(loc, "sound/effects/alien/egg_move.ogg", 25)
flick("egg opening", src)
var/mob/living/carbon/xenomorph/facehugger/new_hugger = new(loc)
@@ -162,10 +162,10 @@
return
if(via_damage)
hugger_type = null
- playsound(loc, "sound/effects/alien_egg_burst.ogg", 30)
+ playsound(loc, "sound/effects/alien/egg_burst.ogg", 30)
flick("egg exploding", src)
return
- playsound(src.loc, "sound/effects/alien_egg_move.ogg", 25)
+ playsound(src.loc, "sound/effects/alien/egg_move.ogg", 25)
flick("egg opening", src)
addtimer(CALLBACK(src, PROC_REF(spawn_hugger), loc), 1 SECONDS)
@@ -277,11 +277,11 @@
return
var/spread = EGG_GAS_DEFAULT_SPREAD
if(via_damage) // More violent destruction, more gas.
- playsound(loc, "sound/effects/alien_egg_burst.ogg", 30)
+ playsound(loc, "sound/effects/alien/egg_burst.ogg", 30)
flick("egg gas exploding", src)
spread = EGG_GAS_KILL_SPREAD
else
- playsound(src.loc, "sound/effects/alien_egg_move.ogg", 25)
+ playsound(src.loc, "sound/effects/alien/egg_move.ogg", 25)
flick("egg gas opening", src)
spread += gas_size_bonus
diff --git a/code/modules/mob/living/carbon/xenomorph/embryo.dm b/code/modules/mob/living/carbon/xenomorph/embryo.dm
index 58aedefb467..a3dae7170e5 100644
--- a/code/modules/mob/living/carbon/xenomorph/embryo.dm
+++ b/code/modules/mob/living/carbon/xenomorph/embryo.dm
@@ -162,7 +162,7 @@
if(picked)
picked.mind.transfer_to(new_xeno, TRUE)
to_chat(new_xeno, span_xenoannounce("We are a xenomorph larva inside a host! Move to burst out of it!"))
- new_xeno << sound('sound/effects/xeno_newlarva.ogg')
+ new_xeno << sound('sound/effects/alien/newlarva.ogg')
stage = 6
@@ -209,7 +209,7 @@
forceMove(veh.exit_location(src))
else
forceMove(get_turf(victim)) //moved to the turf directly so we don't get stuck inside a cryopod or another mob container.
- playsound(src, pick('sound/voice/alien_chestburst.ogg','sound/voice/alien_chestburst2.ogg'), 25)
+ playsound(src, pick('sound/voice/alien/chestburst.ogg','sound/voice/alien/chestburst2.ogg'), 25)
GLOB.round_statistics.total_larva_burst++
SSblackbox.record_feedback("tally", "round_statistics", 1, "total_larva_burst")
var/obj/item/alien_embryo/AE = locate() in victim
diff --git a/code/modules/mob/living/carbon/xenomorph/emote.dm b/code/modules/mob/living/carbon/xenomorph/emote.dm
index cc524fc7fda..33927f20f1d 100644
--- a/code/modules/mob/living/carbon/xenomorph/emote.dm
+++ b/code/modules/mob/living/carbon/xenomorph/emote.dm
@@ -15,23 +15,23 @@
key_third_person = "growls"
message = "growls!"
emote_type = EMOTE_AUDIBLE
- predalien_sound = 'sound/voice/predalien_growl.ogg'
- sound = 'sound/voice/alien_growl1.ogg'
+ predalien_sound = 'sound/voice/alien/predalien/growl.ogg'
+ sound = 'sound/voice/alien/growl1.ogg'
/datum/emote/living/carbon/xenomorph/growl/one
key = "growl1"
- sound = 'sound/voice/alien_growl1.ogg'
+ sound = 'sound/voice/alien/growl1.ogg'
/datum/emote/living/carbon/xenomorph/growl/two
key = "growl2"
- sound = 'sound/voice/alien_growl2.ogg'
+ sound = 'sound/voice/alien/growl2.ogg'
/datum/emote/living/carbon/xenomorph/growl/three
key = "growl3"
- sound = 'sound/voice/alien_growl3.ogg'
+ sound = 'sound/voice/alien/growl3.ogg'
/datum/emote/living/carbon/xenomorph/hiss
@@ -39,23 +39,23 @@
key_third_person = "hisses"
message = "hisses!"
emote_type = EMOTE_AUDIBLE
- predalien_sound = 'sound/voice/predalien_hiss.ogg'
- sound = 'sound/voice/alien_hiss1.ogg'
+ predalien_sound = 'sound/voice/alien/predalien/hiss.ogg'
+ sound = 'sound/voice/alien/hiss1.ogg'
/datum/emote/living/carbon/xenomorph/hiss/one
key = "hiss1"
- sound = 'sound/voice/alien_hiss1.ogg'
+ sound = 'sound/voice/alien/hiss1.ogg'
/datum/emote/living/carbon/xenomorph/hiss/two
key = "hiss2"
- sound = 'sound/voice/alien_hiss2.ogg'
+ sound = 'sound/voice/alien/hiss2.ogg'
/datum/emote/living/carbon/xenomorph/hiss/three
key = "hiss3"
- sound = 'sound/voice/alien_hiss3.ogg'
+ sound = 'sound/voice/alien/hiss3.ogg'
/datum/emote/living/carbon/xenomorph/needhelp
@@ -63,17 +63,17 @@
key_third_person = "needshelp"
message = "needs help!"
emote_type = EMOTE_AUDIBLE
- sound = 'sound/voice/alien_help1.ogg'
+ sound = 'sound/voice/alien/help1.ogg'
/datum/emote/living/carbon/xenomorph/needhelp/one
key = "needhelp1"
- sound = 'sound/voice/alien_help1.ogg'
+ sound = 'sound/voice/alien/help1.ogg'
/datum/emote/living/carbon/xenomorph/needhelp/two
key = "needhelp2"
- sound = 'sound/voice/alien_help2.ogg'
+ sound = 'sound/voice/alien/help2.ogg'
/datum/emote/living/carbon/xenomorph/roar
@@ -81,38 +81,38 @@
key_third_person = "roars"
message = "roars!"
emote_type = EMOTE_AUDIBLE
- predalien_sound = 'sound/voice/predalien_roar.ogg'
- sound = 'sound/voice/alien_roar1.ogg'
+ predalien_sound = 'sound/voice/alien/predalien/roar.ogg'
+ sound = 'sound/voice/alien/roar1.ogg'
/datum/emote/living/carbon/xenomorph/roar/one
key = "roar1"
- sound = 'sound/voice/alien_roar1.ogg'
+ sound = 'sound/voice/alien/roar1.ogg'
/datum/emote/living/carbon/xenomorph/roar/two
key = "roar2"
- sound = 'sound/voice/alien_roar2.ogg'
+ sound = 'sound/voice/alien/roar2.ogg'
/datum/emote/living/carbon/xenomorph/roar/three
key = "roar3"
- sound = 'sound/voice/alien_roar3.ogg'
+ sound = 'sound/voice/alien/roar3.ogg'
/datum/emote/living/carbon/xenomorph/roar/four
key = "roar4"
- sound = 'sound/voice/alien_roar4.ogg'
+ sound = 'sound/voice/alien/roar4.ogg'
/datum/emote/living/carbon/xenomorph/roar/five
key = "roar5"
- sound = 'sound/voice/alien_roar5.ogg'
+ sound = 'sound/voice/alien/roar5.ogg'
/datum/emote/living/carbon/xenomorph/roar/six
key = "roar6"
- sound = 'sound/voice/alien_roar6.ogg'
+ sound = 'sound/voice/alien/roar6.ogg'
/datum/emote/living/carbon/xenomorph/tail
@@ -120,22 +120,22 @@
key_third_person = "tailsweeps"
message = "swipes its tail."
emote_type = EMOTE_AUDIBLE
- sound = 'sound/effects/alien_tail_swipe1.ogg'
+ sound = 'sound/effects/alien/tail_swipe1.ogg'
/datum/emote/living/carbon/xenomorph/tail/one
key = "tail1"
- sound = 'sound/effects/alien_tail_swipe1.ogg'
+ sound = 'sound/effects/alien/tail_swipe1.ogg'
/datum/emote/living/carbon/xenomorph/tail/two
key = "tail2"
- sound = 'sound/effects/alien_tail_swipe2.ogg'
+ sound = 'sound/effects/alien/tail_swipe2.ogg'
/datum/emote/living/carbon/xenomorph/tail/three
key = "tail3"
- sound = 'sound/effects/alien_tail_swipe3.ogg'
+ sound = 'sound/effects/alien/tail_swipe3.ogg'
/datum/emote/living/carbon/xenomorph/run_emote(mob/user, params, type_override, intentional = FALSE, prefix)
diff --git a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm
index b39fb232626..23529590f74 100644
--- a/code/modules/mob/living/carbon/xenomorph/facehuggers.dm
+++ b/code/modules/mob/living/carbon/xenomorph/facehuggers.dm
@@ -594,7 +594,7 @@
kill_hugger()
else
reset_attach_status(as_planned)
- playsound(loc, 'sound/voice/alien_facehugger_dies.ogg', 25, 1)
+ playsound(loc, 'sound/voice/alien/facehugger_dies.ogg', 25, 1)
activetimer = addtimer(CALLBACK(src, PROC_REF(go_active)), activate_time, TIMER_STOPPABLE|TIMER_UNIQUE)
update_icon()
@@ -621,7 +621,7 @@
remove_danger_overlay() //Remove the danger overlay
update_icon()
- playsound(loc, 'sound/voice/alien_facehugger_dies.ogg', 25, 1)
+ playsound(loc, 'sound/voice/alien/facehugger_dies.ogg', 25, 1)
layer = BELOW_MOB_LAYER //so dead hugger appears below live hugger if stacked on same tile.
diff --git a/code/modules/mob/living/carbon/xenomorph/hive_datum.dm b/code/modules/mob/living/carbon/xenomorph/hive_datum.dm
index b127aa0c497..3360e6c0120 100644
--- a/code/modules/mob/living/carbon/xenomorph/hive_datum.dm
+++ b/code/modules/mob/living/carbon/xenomorph/hive_datum.dm
@@ -1266,7 +1266,7 @@ to_chat will check for valid clients itself already so no need to double check f
message_admins("[key_name(xeno_candidate)] has joined as [ADMIN_TPMONTY(new_xeno)].")
xeno_candidate.mob.mind.transfer_to(new_xeno, TRUE)
- new_xeno.playsound_local(new_xeno, 'sound/effects/xeno_newlarva.ogg')
+ new_xeno.playsound_local(new_xeno, 'sound/effects/alien/newlarva.ogg')
to_chat(new_xeno, span_xenoannounce("We are a xenomorph larva awakened from slumber!"))
if(!larva_already_reserved)
xeno_job.occupy_job_positions(1)
diff --git a/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm b/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm
index 31e79e28f98..f7e53ce3d59 100644
--- a/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm
+++ b/code/modules/mob/living/carbon/xenomorph/xenoprocs.dm
@@ -261,7 +261,7 @@
if(evolution_stored == xeno_caste.evolution_threshold)
to_chat(src, span_xenodanger("Our carapace crackles and our tendons strengthen. We are ready to evolve!"))
- SEND_SOUND(src, sound('sound/effects/xeno_evolveready.ogg'))
+ SEND_SOUND(src, sound('sound/effects/alien/evolveready.ogg'))
//This deals with "throwing" xenos -- ravagers, hunters, and runners in particular. Everyone else defaults to normal
diff --git a/code/modules/mob/living/silicon/ai/ai_notifications.dm b/code/modules/mob/living/silicon/ai/ai_notifications.dm
index 59bfb1049bd..7c3b481b6c2 100644
--- a/code/modules/mob/living/silicon/ai/ai_notifications.dm
+++ b/code/modules/mob/living/silicon/ai/ai_notifications.dm
@@ -45,14 +45,14 @@
SIGNAL_HANDLER
var/area/A = get_area(lockedship)
to_chat(src, span_notice("Electronic corruption detected at [A]! Controls overridden!"))
- playsound_local(src, 'sound/voice/4_xeno_roars.ogg', 15)
+ playsound_local(src, 'sound/voice/alien/4_roars.ogg', 15)
notify_ai(src, " Electronic corruption detected at [A]! Controls overridden! " , source = lockedship, action = NOTIFY_AI_ALERT, notify_volume = 15)
///Receive notifications about the tad control equipment being destroyed
/mob/living/silicon/ai/proc/receive_tad_warning(datum/source, obj/machinery/computer/camera_advanced/shuttle_docker/minidropship/ruinedtad)
SIGNAL_HANDLER
to_chat(src, span_notice("Telemetry from our mini dropship reports that the controls have become nonfunctional!"))
- notify_ai(src, " Telemetry from our mini dropship reports that the controls have become nonfunctional! ", ai_sound = 'sound/voice/4_xeno_roars.ogg', source = ruinedtad, action = NOTIFY_AI_ALERT, notify_volume = 15)
+ notify_ai(src, " Telemetry from our mini dropship reports that the controls have become nonfunctional! ", ai_sound = 'sound/voice/alien/4_roars.ogg', source = ruinedtad, action = NOTIFY_AI_ALERT, notify_volume = 15)
///Receive notifications about disks being generated
/mob/living/silicon/ai/proc/show_disk_complete(datum/source, obj/machinery/computer/nuke_disk_generator/generatingcomputer)
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 75a9bb9dccc..6fc64779728 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -45,5 +45,5 @@
if(stat == DEAD)
return ..()
if(!gibbing && !silent)
- playsound(src, 'sound/voice/alien_death.ogg', 50, TRUE)
+ playsound(src, 'sound/voice/alien/death.ogg', 50, TRUE)
return ..()
diff --git a/code/modules/predator/yautja/bracers.dm b/code/modules/predator/yautja/bracers.dm
index c8219aa155c..deae7ceb1f1 100644
--- a/code/modules/predator/yautja/bracers.dm
+++ b/code/modules/predator/yautja/bracers.dm
@@ -616,7 +616,7 @@
exploding = TRUE
var/turf/T = get_turf(src)
if(explosion_type == SD_TYPE_BIG && victim.stat == CONSCIOUS && (is_ground_level(T.z) || SSticker.mode.flags_round_type & MODE_SHIPSIDE_SD))
- playsound(src, 'sound/voice/pred_deathlaugh.ogg', 100, 0, 17)
+ playsound(src, 'sound/voice/predator/deathlaugh.ogg', 100, 0, 17)
playsound(src, 'sound/effects/pred_countdown.ogg', 100, 0, 17)
message_admins(font_size_xl("CLICK TO CANCEL THIS PRED SD"))
diff --git a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
index 1df73bcf698..ed8c6e0de7f 100644
--- a/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
+++ b/code/modules/vehicles/mecha/combat/savannah_ivanov.dm
@@ -155,7 +155,7 @@
*/
/datum/action/vehicle/sealed/mecha/skyfall/proc/land()
chassis.visible_message(span_danger("[chassis] lands from above!"))
- playsound(chassis, 'sound/effects/explosion_large1.ogg', 50, 1)
+ playsound(chassis, 'sound/effects/explosion/large1.ogg', 50, 1)
chassis.resistance_flags &= ~INDESTRUCTIBLE
chassis.mecha_flags &= ~(QUIET_STEPS|QUIET_TURNS|CANNOT_INTERACT)
chassis.phasing = initial(chassis.phasing)
diff --git a/code/modules/xenomorph/silo.dm b/code/modules/xenomorph/silo.dm
index ef3e9ac28ff..1bc6a028beb 100644
--- a/code/modules/xenomorph/silo.dm
+++ b/code/modules/xenomorph/silo.dm
@@ -61,9 +61,9 @@
if(GLOB.hive_datums[hivenumber])
INVOKE_NEXT_TICK(SSticker.mode, TYPE_PROC_REF(/datum/game_mode, update_silo_death_timer), GLOB.hive_datums[hivenumber]) // checks all silos next tick after this one is gone
UnregisterSignal(GLOB.hive_datums[hivenumber], list(COMSIG_HIVE_XENO_MOTHER_PRE_CHECK, COMSIG_HIVE_XENO_MOTHER_CHECK))
- GLOB.hive_datums[hivenumber].xeno_message("A resin silo has been destroyed at [AREACOORD_NO_Z(src)]!", "xenoannounce", 5, FALSE,src.loc, 'sound/voice/alien_help2.ogg',FALSE , null, /atom/movable/screen/arrow/silo_damaged_arrow)
+ GLOB.hive_datums[hivenumber].xeno_message("A resin silo has been destroyed at [AREACOORD_NO_Z(src)]!", "xenoannounce", 5, FALSE,src.loc, 'sound/voice/alien/help2.ogg',FALSE , null, /atom/movable/screen/arrow/silo_damaged_arrow)
notify_ghosts("\ A resin silo has been destroyed at [AREACOORD_NO_Z(src)]!", source = get_turf(src), action = NOTIFY_JUMP)
- playsound(loc,'sound/effects/alien_egg_burst.ogg', 75)
+ playsound(loc,'sound/effects/alien/egg_burst.ogg', 75)
return ..()
/obj/structure/xeno/silo/Destroy()
@@ -106,7 +106,7 @@
return
warning = TRUE
update_minimap_icon()
- GLOB.hive_datums[hivenumber].xeno_message("Our [name] at [AREACOORD_NO_Z(src)] is under attack! It has [obj_integrity]/[max_integrity] Health remaining.", "xenoannounce", 5, FALSE, src, 'sound/voice/alien_help1.ogg',FALSE, null, /atom/movable/screen/arrow/silo_damaged_arrow)
+ GLOB.hive_datums[hivenumber].xeno_message("Our [name] at [AREACOORD_NO_Z(src)] is under attack! It has [obj_integrity]/[max_integrity] Health remaining.", "xenoannounce", 5, FALSE, src, 'sound/voice/alien/help1.ogg',FALSE, null, /atom/movable/screen/arrow/silo_damaged_arrow)
COOLDOWN_START(src, silo_damage_alert_cooldown, XENO_SILO_HEALTH_ALERT_COOLDOWN) //set the cooldown.
addtimer(CALLBACK(src, PROC_REF(clear_warning)), XENO_SILO_HEALTH_ALERT_COOLDOWN) //clear warning
@@ -131,7 +131,7 @@
warning = TRUE
update_minimap_icon()
- GLOB.hive_datums[hivenumber].xeno_message("Our [name] has detected a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y]).", "xenoannounce", 5, FALSE, hostile, 'sound/voice/alien_help1.ogg', FALSE, null, /atom/movable/screen/arrow/leader_tracker_arrow)
+ GLOB.hive_datums[hivenumber].xeno_message("Our [name] has detected a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y]).", "xenoannounce", 5, FALSE, hostile, 'sound/voice/alien/help1.ogg', FALSE, null, /atom/movable/screen/arrow/leader_tracker_arrow)
COOLDOWN_START(src, silo_proxy_alert_cooldown, XENO_SILO_DETECTION_COOLDOWN) //set the cooldown.
addtimer(CALLBACK(src, PROC_REF(clear_warning)), XENO_SILO_DETECTION_COOLDOWN) //clear warning
diff --git a/code/modules/xenomorph/spawner.dm b/code/modules/xenomorph/spawner.dm
index 441780081b0..28747bb1f22 100644
--- a/code/modules/xenomorph/spawner.dm
+++ b/code/modules/xenomorph/spawner.dm
@@ -53,7 +53,7 @@
return
warning = TRUE
update_minimap_icon()
- GLOB.hive_datums[hivenumber].xeno_message("Our [name] at [AREACOORD_NO_Z(src)] is under attack! It has [obj_integrity]/[max_integrity] Health remaining.", "xenoannounce", 5, FALSE, src, 'sound/voice/alien_help1.ogg',FALSE, null, /atom/movable/screen/arrow/silo_damaged_arrow)
+ GLOB.hive_datums[hivenumber].xeno_message("Our [name] at [AREACOORD_NO_Z(src)] is under attack! It has [obj_integrity]/[max_integrity] Health remaining.", "xenoannounce", 5, FALSE, src, 'sound/voice/alien/help1.ogg',FALSE, null, /atom/movable/screen/arrow/silo_damaged_arrow)
COOLDOWN_START(src, spawner_damage_alert_cooldown, XENO_SILO_HEALTH_ALERT_COOLDOWN) //set the cooldown.
addtimer(CALLBACK(src, PROC_REF(clear_warning)), XENO_SILO_DETECTION_COOLDOWN) //clear warning
@@ -79,7 +79,7 @@
warning = TRUE
update_minimap_icon()
- GLOB.hive_datums[hivenumber].xeno_message("Our [name] has detected a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y]).", "xenoannounce", 5, FALSE, hostile, 'sound/voice/alien_help1.ogg', FALSE, null, /atom/movable/screen/arrow/leader_tracker_arrow)
+ GLOB.hive_datums[hivenumber].xeno_message("Our [name] has detected a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y]).", "xenoannounce", 5, FALSE, hostile, 'sound/voice/alien/help1.ogg', FALSE, null, /atom/movable/screen/arrow/leader_tracker_arrow)
COOLDOWN_START(src, spawner_proxy_alert_cooldown, XENO_SILO_DETECTION_COOLDOWN) //set the cooldown.
addtimer(CALLBACK(src, PROC_REF(clear_warning)), XENO_SILO_DETECTION_COOLDOWN) //clear warning
diff --git a/code/modules/xenomorph/trap.dm b/code/modules/xenomorph/trap.dm
index f6180ad44ae..a8cfea59a82 100644
--- a/code/modules/xenomorph/trap.dm
+++ b/code/modules/xenomorph/trap.dm
@@ -121,7 +121,7 @@
if(TRAP_ACID_STRONG)
for(var/turf/acided AS in RANGE_TURFS(1, src))
new /obj/effect/xenomorph/spray/strong(acided, 12 SECONDS, XENO_HIGH_ACID_PUDDLE_DAMAGE)
- xeno_message("A [trap_type] trap at [AREACOORD_NO_Z(src)] has been triggered!", "xenoannounce", 5, hivenumber, FALSE, get_turf(src), 'sound/voice/alien_talk2.ogg', FALSE, null, /atom/movable/screen/arrow/attack_order_arrow, COLOR_ORANGE, TRUE)
+ xeno_message("A [trap_type] trap at [AREACOORD_NO_Z(src)] has been triggered!", "xenoannounce", 5, hivenumber, FALSE, get_turf(src), 'sound/voice/alien/talk2.ogg', FALSE, null, /atom/movable/screen/arrow/attack_order_arrow, COLOR_ORANGE, TRUE)
set_trap_type(null)
/// Move the hugger out of the trap
diff --git a/code/modules/xenomorph/turret.dm b/code/modules/xenomorph/turret.dm
index 11a6905b9a4..82b2c92ab07 100644
--- a/code/modules/xenomorph/turret.dm
+++ b/code/modules/xenomorph/turret.dm
@@ -70,7 +70,7 @@
set_hostile(null)
set_last_hostile(null)
STOP_PROCESSING(SSobj, src)
- playsound(loc,'sound/effects/xeno_turret_death.ogg', 70)
+ playsound(loc,'sound/effects/alien/turret_death.ogg', 70)
return ..()
/obj/structure/xeno/xeno_turret/ex_act(severity)
@@ -110,7 +110,7 @@
set_last_hostile(null)
return
if(!TIMER_COOLDOWN_CHECK(src, COOLDOWN_XENO_TURRETS_ALERT))
- GLOB.hive_datums[hivenumber].xeno_message("Our [name] is attacking a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y]).", "xenoannounce", 5, FALSE, hostile, 'sound/voice/alien_help1.ogg', FALSE, null, /atom/movable/screen/arrow/turret_attacking_arrow)
+ GLOB.hive_datums[hivenumber].xeno_message("Our [name] is attacking a nearby hostile [hostile] at [get_area(hostile)] (X: [hostile.x], Y: [hostile.y]).", "xenoannounce", 5, FALSE, hostile, 'sound/voice/alien/help1.ogg', FALSE, null, /atom/movable/screen/arrow/turret_attacking_arrow)
TIMER_COOLDOWN_START(src, COOLDOWN_XENO_TURRETS_ALERT, 20 SECONDS)
if(hostile != last_hostile)
set_last_hostile(hostile)
diff --git a/sound/effects/behemoth/earth_pillar_destroyed.ogg b/sound/effects/alien/behemoth/earth_pillar_destroyed.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_destroyed.ogg
rename to sound/effects/alien/behemoth/earth_pillar_destroyed.ogg
diff --git a/sound/effects/behemoth/earth_pillar_eating.ogg b/sound/effects/alien/behemoth/earth_pillar_eating.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_eating.ogg
rename to sound/effects/alien/behemoth/earth_pillar_eating.ogg
diff --git a/sound/effects/behemoth/earth_pillar_hit_1.ogg b/sound/effects/alien/behemoth/earth_pillar_hit_1.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_hit_1.ogg
rename to sound/effects/alien/behemoth/earth_pillar_hit_1.ogg
diff --git a/sound/effects/behemoth/earth_pillar_hit_2.ogg b/sound/effects/alien/behemoth/earth_pillar_hit_2.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_hit_2.ogg
rename to sound/effects/alien/behemoth/earth_pillar_hit_2.ogg
diff --git a/sound/effects/behemoth/earth_pillar_hit_3.ogg b/sound/effects/alien/behemoth/earth_pillar_hit_3.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_hit_3.ogg
rename to sound/effects/alien/behemoth/earth_pillar_hit_3.ogg
diff --git a/sound/effects/behemoth/earth_pillar_hit_4.ogg b/sound/effects/alien/behemoth/earth_pillar_hit_4.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_hit_4.ogg
rename to sound/effects/alien/behemoth/earth_pillar_hit_4.ogg
diff --git a/sound/effects/behemoth/earth_pillar_hit_5.ogg b/sound/effects/alien/behemoth/earth_pillar_hit_5.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_hit_5.ogg
rename to sound/effects/alien/behemoth/earth_pillar_hit_5.ogg
diff --git a/sound/effects/behemoth/earth_pillar_hit_6.ogg b/sound/effects/alien/behemoth/earth_pillar_hit_6.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_hit_6.ogg
rename to sound/effects/alien/behemoth/earth_pillar_hit_6.ogg
diff --git a/sound/effects/behemoth/earth_pillar_rising.ogg b/sound/effects/alien/behemoth/earth_pillar_rising.ogg
similarity index 100%
rename from sound/effects/behemoth/earth_pillar_rising.ogg
rename to sound/effects/alien/behemoth/earth_pillar_rising.ogg
diff --git a/sound/effects/behemoth/landslide_enhanced_charge.ogg b/sound/effects/alien/behemoth/landslide_enhanced_charge.ogg
similarity index 100%
rename from sound/effects/behemoth/landslide_enhanced_charge.ogg
rename to sound/effects/alien/behemoth/landslide_enhanced_charge.ogg
diff --git a/sound/effects/behemoth/landslide_hit_mob.ogg b/sound/effects/alien/behemoth/landslide_hit_mob.ogg
similarity index 100%
rename from sound/effects/behemoth/landslide_hit_mob.ogg
rename to sound/effects/alien/behemoth/landslide_hit_mob.ogg
diff --git a/sound/effects/behemoth/landslide_roar.ogg b/sound/effects/alien/behemoth/landslide_roar.ogg
similarity index 100%
rename from sound/effects/behemoth/landslide_roar.ogg
rename to sound/effects/alien/behemoth/landslide_roar.ogg
diff --git a/sound/effects/behemoth/primal_wrath_roar.ogg b/sound/effects/alien/behemoth/primal_wrath_roar.ogg
similarity index 100%
rename from sound/effects/behemoth/primal_wrath_roar.ogg
rename to sound/effects/alien/behemoth/primal_wrath_roar.ogg
diff --git a/sound/effects/behemoth/behemoth_roll.ogg b/sound/effects/alien/behemoth/roll.ogg
similarity index 100%
rename from sound/effects/behemoth/behemoth_roll.ogg
rename to sound/effects/alien/behemoth/roll.ogg
diff --git a/sound/effects/behemoth/behemoth_rumble.ogg b/sound/effects/alien/behemoth/rumble.ogg
similarity index 100%
rename from sound/effects/behemoth/behemoth_rumble.ogg
rename to sound/effects/alien/behemoth/rumble.ogg
diff --git a/sound/effects/behemoth/seismic_fracture_explosion.ogg b/sound/effects/alien/behemoth/seismic_fracture_explosion.ogg
similarity index 100%
rename from sound/effects/behemoth/seismic_fracture_explosion.ogg
rename to sound/effects/alien/behemoth/seismic_fracture_explosion.ogg
diff --git a/sound/effects/behemoth/behemoth_stomp.ogg b/sound/effects/alien/behemoth/stomp.ogg
similarity index 100%
rename from sound/effects/behemoth/behemoth_stomp.ogg
rename to sound/effects/alien/behemoth/stomp.ogg
diff --git a/sound/effects/alien_egg_burst.ogg b/sound/effects/alien/egg_burst.ogg
similarity index 100%
rename from sound/effects/alien_egg_burst.ogg
rename to sound/effects/alien/egg_burst.ogg
diff --git a/sound/effects/alien_egg_move.ogg b/sound/effects/alien/egg_move.ogg
similarity index 100%
rename from sound/effects/alien_egg_move.ogg
rename to sound/effects/alien/egg_move.ogg
diff --git a/sound/effects/xeno_evolveready.ogg b/sound/effects/alien/evolveready.ogg
similarity index 100%
rename from sound/effects/xeno_evolveready.ogg
rename to sound/effects/alien/evolveready.ogg
diff --git a/sound/effects/xeno_newlarva.ogg b/sound/effects/alien/newlarva.ogg
similarity index 100%
rename from sound/effects/xeno_newlarva.ogg
rename to sound/effects/alien/newlarva.ogg
diff --git a/sound/effects/alien_recycler.ogg b/sound/effects/alien/recycler.ogg
similarity index 100%
rename from sound/effects/alien_recycler.ogg
rename to sound/effects/alien/recycler.ogg
diff --git a/sound/effects/alien_resin_break1.ogg b/sound/effects/alien/resin_break1.ogg
similarity index 100%
rename from sound/effects/alien_resin_break1.ogg
rename to sound/effects/alien/resin_break1.ogg
diff --git a/sound/effects/alien_resin_break2.ogg b/sound/effects/alien/resin_break2.ogg
similarity index 100%
rename from sound/effects/alien_resin_break2.ogg
rename to sound/effects/alien/resin_break2.ogg
diff --git a/sound/effects/alien_resin_build1.ogg b/sound/effects/alien/resin_build1.ogg
similarity index 100%
rename from sound/effects/alien_resin_build1.ogg
rename to sound/effects/alien/resin_build1.ogg
diff --git a/sound/effects/alien_resin_build2.ogg b/sound/effects/alien/resin_build2.ogg
similarity index 100%
rename from sound/effects/alien_resin_build2.ogg
rename to sound/effects/alien/resin_build2.ogg
diff --git a/sound/effects/alien_resin_build3.ogg b/sound/effects/alien/resin_build3.ogg
similarity index 100%
rename from sound/effects/alien_resin_build3.ogg
rename to sound/effects/alien/resin_build3.ogg
diff --git a/sound/effects/footstep/alien_resin_move1.ogg b/sound/effects/alien/resin_move1.ogg
similarity index 100%
rename from sound/effects/footstep/alien_resin_move1.ogg
rename to sound/effects/alien/resin_move1.ogg
diff --git a/sound/effects/footstep/alien_resin_move2.ogg b/sound/effects/alien/resin_move2.ogg
similarity index 100%
rename from sound/effects/footstep/alien_resin_move2.ogg
rename to sound/effects/alien/resin_move2.ogg
diff --git a/sound/effects/alien_tail_swipe1.ogg b/sound/effects/alien/tail_swipe1.ogg
similarity index 100%
rename from sound/effects/alien_tail_swipe1.ogg
rename to sound/effects/alien/tail_swipe1.ogg
diff --git a/sound/effects/alien_tail_swipe2.ogg b/sound/effects/alien/tail_swipe2.ogg
similarity index 100%
rename from sound/effects/alien_tail_swipe2.ogg
rename to sound/effects/alien/tail_swipe2.ogg
diff --git a/sound/effects/alien_tail_swipe3.ogg b/sound/effects/alien/tail_swipe3.ogg
similarity index 100%
rename from sound/effects/alien_tail_swipe3.ogg
rename to sound/effects/alien/tail_swipe3.ogg
diff --git a/sound/effects/xeno_turret_death.ogg b/sound/effects/alien/turret_death.ogg
similarity index 100%
rename from sound/effects/xeno_turret_death.ogg
rename to sound/effects/alien/turret_death.ogg
diff --git a/sound/effects/alien_ventcrawl1.ogg b/sound/effects/alien/ventcrawl1.ogg
similarity index 100%
rename from sound/effects/alien_ventcrawl1.ogg
rename to sound/effects/alien/ventcrawl1.ogg
diff --git a/sound/effects/alien_ventcrawl2.ogg b/sound/effects/alien/ventcrawl2.ogg
similarity index 100%
rename from sound/effects/alien_ventcrawl2.ogg
rename to sound/effects/alien/ventcrawl2.ogg
diff --git a/sound/effects/alien_ventpass1.ogg b/sound/effects/alien/ventpass1.ogg
similarity index 100%
rename from sound/effects/alien_ventpass1.ogg
rename to sound/effects/alien/ventpass1.ogg
diff --git a/sound/effects/alien_ventpass2.ogg b/sound/effects/alien/ventpass2.ogg
similarity index 100%
rename from sound/effects/alien_ventpass2.ogg
rename to sound/effects/alien/ventpass2.ogg
diff --git a/sound/effects/explosioncreak1.ogg b/sound/effects/explosion/creak1.ogg
similarity index 100%
rename from sound/effects/explosioncreak1.ogg
rename to sound/effects/explosion/creak1.ogg
diff --git a/sound/effects/explosioncreak2.ogg b/sound/effects/explosion/creak2.ogg
similarity index 100%
rename from sound/effects/explosioncreak2.ogg
rename to sound/effects/explosion/creak2.ogg
diff --git a/sound/effects/explosionfar.ogg b/sound/effects/explosion/far0.ogg
similarity index 100%
rename from sound/effects/explosionfar.ogg
rename to sound/effects/explosion/far0.ogg
diff --git a/sound/effects/explosion_far1.ogg b/sound/effects/explosion/far1.ogg
similarity index 100%
rename from sound/effects/explosion_far1.ogg
rename to sound/effects/explosion/far1.ogg
diff --git a/sound/effects/explosion_far2.ogg b/sound/effects/explosion/far2.ogg
similarity index 100%
rename from sound/effects/explosion_far2.ogg
rename to sound/effects/explosion/far2.ogg
diff --git a/sound/effects/explosion_far3.ogg b/sound/effects/explosion/far3.ogg
similarity index 100%
rename from sound/effects/explosion_far3.ogg
rename to sound/effects/explosion/far3.ogg
diff --git a/sound/effects/explosion_far4.ogg b/sound/effects/explosion/far4.ogg
similarity index 100%
rename from sound/effects/explosion_far4.ogg
rename to sound/effects/explosion/far4.ogg
diff --git a/sound/effects/explosion_far5.ogg b/sound/effects/explosion/far5.ogg
similarity index 100%
rename from sound/effects/explosion_far5.ogg
rename to sound/effects/explosion/far5.ogg
diff --git a/sound/effects/incendiary_explosion_1.ogg b/sound/effects/explosion/incendiary1.ogg
similarity index 100%
rename from sound/effects/incendiary_explosion_1.ogg
rename to sound/effects/explosion/incendiary1.ogg
diff --git a/sound/effects/incendiary_explosion_2.ogg b/sound/effects/explosion/incendiary2.ogg
similarity index 100%
rename from sound/effects/incendiary_explosion_2.ogg
rename to sound/effects/explosion/incendiary2.ogg
diff --git a/sound/effects/incendiary_explosion_3.ogg b/sound/effects/explosion/incendiary3.ogg
similarity index 100%
rename from sound/effects/incendiary_explosion_3.ogg
rename to sound/effects/explosion/incendiary3.ogg
diff --git a/sound/effects/explosion_large1.ogg b/sound/effects/explosion/large1.ogg
similarity index 100%
rename from sound/effects/explosion_large1.ogg
rename to sound/effects/explosion/large1.ogg
diff --git a/sound/effects/explosion_large2.ogg b/sound/effects/explosion/large2.ogg
similarity index 100%
rename from sound/effects/explosion_large2.ogg
rename to sound/effects/explosion/large2.ogg
diff --git a/sound/effects/explosion_large3.ogg b/sound/effects/explosion/large3.ogg
similarity index 100%
rename from sound/effects/explosion_large3.ogg
rename to sound/effects/explosion/large3.ogg
diff --git a/sound/effects/explosion_large4.ogg b/sound/effects/explosion/large4.ogg
similarity index 100%
rename from sound/effects/explosion_large4.ogg
rename to sound/effects/explosion/large4.ogg
diff --git a/sound/effects/explosion_large5.ogg b/sound/effects/explosion/large5.ogg
similarity index 100%
rename from sound/effects/explosion_large5.ogg
rename to sound/effects/explosion/large5.ogg
diff --git a/sound/effects/explosion_large6.ogg b/sound/effects/explosion/large6.ogg
similarity index 100%
rename from sound/effects/explosion_large6.ogg
rename to sound/effects/explosion/large6.ogg
diff --git a/sound/effects/explosion_med1.ogg b/sound/effects/explosion/medium1.ogg
similarity index 100%
rename from sound/effects/explosion_med1.ogg
rename to sound/effects/explosion/medium1.ogg
diff --git a/sound/effects/explosion_med2.ogg b/sound/effects/explosion/medium2.ogg
similarity index 100%
rename from sound/effects/explosion_med2.ogg
rename to sound/effects/explosion/medium2.ogg
diff --git a/sound/effects/explosion_med3.ogg b/sound/effects/explosion/medium3.ogg
similarity index 100%
rename from sound/effects/explosion_med3.ogg
rename to sound/effects/explosion/medium3.ogg
diff --git a/sound/effects/explosion_med4.ogg b/sound/effects/explosion/medium4.ogg
similarity index 100%
rename from sound/effects/explosion_med4.ogg
rename to sound/effects/explosion/medium4.ogg
diff --git a/sound/effects/explosion_med5.ogg b/sound/effects/explosion/medium5.ogg
similarity index 100%
rename from sound/effects/explosion_med5.ogg
rename to sound/effects/explosion/medium5.ogg
diff --git a/sound/effects/explosion_med6.ogg b/sound/effects/explosion/medium6.ogg
similarity index 100%
rename from sound/effects/explosion_med6.ogg
rename to sound/effects/explosion/medium6.ogg
diff --git a/sound/effects/explosion_micro1.ogg b/sound/effects/explosion/micro1.ogg
similarity index 100%
rename from sound/effects/explosion_micro1.ogg
rename to sound/effects/explosion/micro1.ogg
diff --git a/sound/effects/explosion_micro2.ogg b/sound/effects/explosion/micro2.ogg
similarity index 100%
rename from sound/effects/explosion_micro2.ogg
rename to sound/effects/explosion/micro2.ogg
diff --git a/sound/effects/explosion_micro3.ogg b/sound/effects/explosion/micro3.ogg
similarity index 100%
rename from sound/effects/explosion_micro3.ogg
rename to sound/effects/explosion/micro3.ogg
diff --git a/sound/effects/explosion_small1.ogg b/sound/effects/explosion/small1.ogg
similarity index 100%
rename from sound/effects/explosion_small1.ogg
rename to sound/effects/explosion/small1.ogg
diff --git a/sound/effects/explosion_small2.ogg b/sound/effects/explosion/small2.ogg
similarity index 100%
rename from sound/effects/explosion_small2.ogg
rename to sound/effects/explosion/small2.ogg
diff --git a/sound/effects/explosion_small3.ogg b/sound/effects/explosion/small3.ogg
similarity index 100%
rename from sound/effects/explosion_small3.ogg
rename to sound/effects/explosion/small3.ogg
diff --git a/sound/effects/explosion_small4.ogg b/sound/effects/explosion/small4.ogg
similarity index 100%
rename from sound/effects/explosion_small4.ogg
rename to sound/effects/explosion/small4.ogg
diff --git a/sound/effects/explosionsmallfar.ogg b/sound/effects/explosion/small_far0.ogg
similarity index 100%
rename from sound/effects/explosionsmallfar.ogg
rename to sound/effects/explosion/small_far0.ogg
diff --git a/sound/effects/explosion_smallfar1.ogg b/sound/effects/explosion/small_far1.ogg
similarity index 100%
rename from sound/effects/explosion_smallfar1.ogg
rename to sound/effects/explosion/small_far1.ogg
diff --git a/sound/effects/explosion_smallfar2.ogg b/sound/effects/explosion/small_far2.ogg
similarity index 100%
rename from sound/effects/explosion_smallfar2.ogg
rename to sound/effects/explosion/small_far2.ogg
diff --git a/sound/effects/explosion_smallfar3.ogg b/sound/effects/explosion/small_far3.ogg
similarity index 100%
rename from sound/effects/explosion_smallfar3.ogg
rename to sound/effects/explosion/small_far3.ogg
diff --git a/sound/effects/explosion_smallfar4.ogg b/sound/effects/explosion/small_far4.ogg
similarity index 100%
rename from sound/effects/explosion_smallfar4.ogg
rename to sound/effects/explosion/small_far4.ogg
diff --git a/sound/effects/alien_footstep_charge1.ogg b/sound/effects/footstep/alien/charge1.ogg
similarity index 100%
rename from sound/effects/alien_footstep_charge1.ogg
rename to sound/effects/footstep/alien/charge1.ogg
diff --git a/sound/effects/alien_footstep_charge2.ogg b/sound/effects/footstep/alien/charge2.ogg
similarity index 100%
rename from sound/effects/alien_footstep_charge2.ogg
rename to sound/effects/footstep/alien/charge2.ogg
diff --git a/sound/effects/alien_footstep_charge3.ogg b/sound/effects/footstep/alien/charge3.ogg
similarity index 100%
rename from sound/effects/alien_footstep_charge3.ogg
rename to sound/effects/footstep/alien/charge3.ogg
diff --git a/sound/effects/alien_footstep_large1.ogg b/sound/effects/footstep/alien/large1.ogg
similarity index 100%
rename from sound/effects/alien_footstep_large1.ogg
rename to sound/effects/footstep/alien/large1.ogg
diff --git a/sound/effects/alien_footstep_large2.ogg b/sound/effects/footstep/alien/large2.ogg
similarity index 100%
rename from sound/effects/alien_footstep_large2.ogg
rename to sound/effects/footstep/alien/large2.ogg
diff --git a/sound/effects/alien_footstep_large3.ogg b/sound/effects/footstep/alien/large3.ogg
similarity index 100%
rename from sound/effects/alien_footstep_large3.ogg
rename to sound/effects/footstep/alien/large3.ogg
diff --git a/sound/effects/alien_footstep_medium1.ogg b/sound/effects/footstep/alien/medium1.ogg
similarity index 100%
rename from sound/effects/alien_footstep_medium1.ogg
rename to sound/effects/footstep/alien/medium1.ogg
diff --git a/sound/effects/alien_footstep_medium2.ogg b/sound/effects/footstep/alien/medium2.ogg
similarity index 100%
rename from sound/effects/alien_footstep_medium2.ogg
rename to sound/effects/footstep/alien/medium2.ogg
diff --git a/sound/effects/alien_footstep_medium3.ogg b/sound/effects/footstep/alien/medium3.ogg
similarity index 100%
rename from sound/effects/alien_footstep_medium3.ogg
rename to sound/effects/footstep/alien/medium3.ogg
diff --git a/sound/effects/alien_resin_move1.ogg b/sound/effects/footstep/alien/resin_move1.ogg
similarity index 100%
rename from sound/effects/alien_resin_move1.ogg
rename to sound/effects/footstep/alien/resin_move1.ogg
diff --git a/sound/effects/alien_resin_move2.ogg b/sound/effects/footstep/alien/resin_move2.ogg
similarity index 100%
rename from sound/effects/alien_resin_move2.ogg
rename to sound/effects/footstep/alien/resin_move2.ogg
diff --git a/sound/effects/footstep/alien_footstep_large1.ogg b/sound/effects/footstep/alien_footstep_large1.ogg
deleted file mode 100644
index 52920063520..00000000000
Binary files a/sound/effects/footstep/alien_footstep_large1.ogg and /dev/null differ
diff --git a/sound/effects/footstep/alien_footstep_large2.ogg b/sound/effects/footstep/alien_footstep_large2.ogg
deleted file mode 100644
index c5ff7040a26..00000000000
Binary files a/sound/effects/footstep/alien_footstep_large2.ogg and /dev/null differ
diff --git a/sound/effects/footstep/alien_footstep_large3.ogg b/sound/effects/footstep/alien_footstep_large3.ogg
deleted file mode 100644
index d5a6d280dbb..00000000000
Binary files a/sound/effects/footstep/alien_footstep_large3.ogg and /dev/null differ
diff --git a/sound/effects/footstep/alien_footstep_medium1.ogg b/sound/effects/footstep/alien_footstep_medium1.ogg
deleted file mode 100644
index dd68658f8ae..00000000000
Binary files a/sound/effects/footstep/alien_footstep_medium1.ogg and /dev/null differ
diff --git a/sound/effects/footstep/alien_footstep_medium2.ogg b/sound/effects/footstep/alien_footstep_medium2.ogg
deleted file mode 100644
index 59acd63e2b7..00000000000
Binary files a/sound/effects/footstep/alien_footstep_medium2.ogg and /dev/null differ
diff --git a/sound/effects/footstep/alien_footstep_medium3.ogg b/sound/effects/footstep/alien_footstep_medium3.ogg
deleted file mode 100644
index bc1b6589de5..00000000000
Binary files a/sound/effects/footstep/alien_footstep_medium3.ogg and /dev/null differ
diff --git a/sound/voice/4_xeno_roars.ogg b/sound/voice/alien/4_roars.ogg
similarity index 100%
rename from sound/voice/4_xeno_roars.ogg
rename to sound/voice/alien/4_roars.ogg
diff --git a/sound/voice/alien_chestburst.ogg b/sound/voice/alien/chestburst.ogg
similarity index 100%
rename from sound/voice/alien_chestburst.ogg
rename to sound/voice/alien/chestburst.ogg
diff --git a/sound/voice/alien_chestburst2.ogg b/sound/voice/alien/chestburst2.ogg
similarity index 100%
rename from sound/voice/alien_chestburst2.ogg
rename to sound/voice/alien/chestburst2.ogg
diff --git a/sound/voice/alien_death.ogg b/sound/voice/alien/death.ogg
similarity index 100%
rename from sound/voice/alien_death.ogg
rename to sound/voice/alien/death.ogg
diff --git a/sound/voice/alien_death2.ogg b/sound/voice/alien/death2.ogg
similarity index 100%
rename from sound/voice/alien_death2.ogg
rename to sound/voice/alien/death2.ogg
diff --git a/sound/voice/alien_distantroar_3.ogg b/sound/voice/alien/distantroar_3.ogg
similarity index 100%
rename from sound/voice/alien_distantroar_3.ogg
rename to sound/voice/alien/distantroar_3.ogg
diff --git a/sound/voice/alien_drool1.ogg b/sound/voice/alien/drool1.ogg
similarity index 100%
rename from sound/voice/alien_drool1.ogg
rename to sound/voice/alien/drool1.ogg
diff --git a/sound/voice/alien_drool2.ogg b/sound/voice/alien/drool2.ogg
similarity index 100%
rename from sound/voice/alien_drool2.ogg
rename to sound/voice/alien/drool2.ogg
diff --git a/sound/voice/alien_facehugger_dies.ogg b/sound/voice/alien/facehugger_dies.ogg
similarity index 100%
rename from sound/voice/alien_facehugger_dies.ogg
rename to sound/voice/alien/facehugger_dies.ogg
diff --git a/sound/voice/alien_growl1.ogg b/sound/voice/alien/growl1.ogg
similarity index 100%
rename from sound/voice/alien_growl1.ogg
rename to sound/voice/alien/growl1.ogg
diff --git a/sound/voice/alien_growl2.ogg b/sound/voice/alien/growl2.ogg
similarity index 100%
rename from sound/voice/alien_growl2.ogg
rename to sound/voice/alien/growl2.ogg
diff --git a/sound/voice/alien_growl3.ogg b/sound/voice/alien/growl3.ogg
similarity index 100%
rename from sound/voice/alien_growl3.ogg
rename to sound/voice/alien/growl3.ogg
diff --git a/sound/voice/alien_growl4.ogg b/sound/voice/alien/growl4.ogg
similarity index 100%
rename from sound/voice/alien_growl4.ogg
rename to sound/voice/alien/growl4.ogg
diff --git a/sound/voice/alien_help1.ogg b/sound/voice/alien/help1.ogg
similarity index 100%
rename from sound/voice/alien_help1.ogg
rename to sound/voice/alien/help1.ogg
diff --git a/sound/voice/alien_help2.ogg b/sound/voice/alien/help2.ogg
similarity index 100%
rename from sound/voice/alien_help2.ogg
rename to sound/voice/alien/help2.ogg
diff --git a/sound/voice/alien_hiss1.ogg b/sound/voice/alien/hiss1.ogg
similarity index 100%
rename from sound/voice/alien_hiss1.ogg
rename to sound/voice/alien/hiss1.ogg
diff --git a/sound/voice/alien_hiss2.ogg b/sound/voice/alien/hiss2.ogg
similarity index 100%
rename from sound/voice/alien_hiss2.ogg
rename to sound/voice/alien/hiss2.ogg
diff --git a/sound/voice/alien_hiss3.ogg b/sound/voice/alien/hiss3.ogg
similarity index 100%
rename from sound/voice/alien_hiss3.ogg
rename to sound/voice/alien/hiss3.ogg
diff --git a/sound/voice/hiss1.ogg b/sound/voice/alien/hiss4.ogg
similarity index 100%
rename from sound/voice/hiss1.ogg
rename to sound/voice/alien/hiss4.ogg
diff --git a/sound/voice/hiss2.ogg b/sound/voice/alien/hiss5.ogg
similarity index 100%
rename from sound/voice/hiss2.ogg
rename to sound/voice/alien/hiss5.ogg
diff --git a/sound/voice/hiss3.ogg b/sound/voice/alien/hiss6.ogg
similarity index 100%
rename from sound/voice/hiss3.ogg
rename to sound/voice/alien/hiss6.ogg
diff --git a/sound/voice/hiss4.ogg b/sound/voice/alien/hiss7.ogg
similarity index 100%
rename from sound/voice/hiss4.ogg
rename to sound/voice/alien/hiss7.ogg
diff --git a/sound/voice/hiss5.ogg b/sound/voice/alien/hiss8.ogg
similarity index 100%
rename from sound/voice/hiss5.ogg
rename to sound/voice/alien/hiss8.ogg
diff --git a/sound/voice/hiss6.ogg b/sound/voice/alien/hiss9.ogg
similarity index 100%
rename from sound/voice/hiss6.ogg
rename to sound/voice/alien/hiss9.ogg
diff --git a/sound/voice/alien_king_died.ogg b/sound/voice/alien/king_died.ogg
similarity index 100%
rename from sound/voice/alien_king_died.ogg
rename to sound/voice/alien/king_died.ogg
diff --git a/sound/voice/ed209_20sec.ogg b/sound/voice/alien/king_roar.ogg
similarity index 100%
rename from sound/voice/ed209_20sec.ogg
rename to sound/voice/alien/king_roar.ogg
diff --git a/sound/voice/alien_roar_larva1.ogg b/sound/voice/alien/larva/roar1.ogg
similarity index 100%
rename from sound/voice/alien_roar_larva1.ogg
rename to sound/voice/alien/larva/roar1.ogg
diff --git a/sound/voice/alien_roar_larva2.ogg b/sound/voice/alien/larva/roar2.ogg
similarity index 100%
rename from sound/voice/alien_roar_larva2.ogg
rename to sound/voice/alien/larva/roar2.ogg
diff --git a/sound/voice/alien_roar_larva3.ogg b/sound/voice/alien/larva/roar3.ogg
similarity index 100%
rename from sound/voice/alien_roar_larva3.ogg
rename to sound/voice/alien/larva/roar3.ogg
diff --git a/sound/voice/alien_roar_larva4.ogg b/sound/voice/alien/larva/roar4.ogg
similarity index 100%
rename from sound/voice/alien_roar_larva4.ogg
rename to sound/voice/alien/larva/roar4.ogg
diff --git a/sound/voice/larva_talk1.ogg b/sound/voice/alien/larva/talk1.ogg
similarity index 100%
rename from sound/voice/larva_talk1.ogg
rename to sound/voice/alien/larva/talk1.ogg
diff --git a/sound/voice/larva_talk2.ogg b/sound/voice/alien/larva/talk2.ogg
similarity index 100%
rename from sound/voice/larva_talk2.ogg
rename to sound/voice/alien/larva/talk2.ogg
diff --git a/sound/voice/larva_talk3.ogg b/sound/voice/alien/larva/talk3.ogg
similarity index 100%
rename from sound/voice/larva_talk3.ogg
rename to sound/voice/alien/larva/talk3.ogg
diff --git a/sound/voice/larva_talk4.ogg b/sound/voice/alien/larva/talk4.ogg
similarity index 100%
rename from sound/voice/larva_talk4.ogg
rename to sound/voice/alien/larva/talk4.ogg
diff --git a/sound/voice/alien_pounce.ogg b/sound/voice/alien/pounce.ogg
similarity index 100%
rename from sound/voice/alien_pounce.ogg
rename to sound/voice/alien/pounce.ogg
diff --git a/sound/voice/alien_pounce2.ogg b/sound/voice/alien/pounce2.ogg
similarity index 100%
rename from sound/voice/alien_pounce2.ogg
rename to sound/voice/alien/pounce2.ogg
diff --git a/sound/voice/predalien_click.ogg b/sound/voice/alien/predalien/click.ogg
similarity index 100%
rename from sound/voice/predalien_click.ogg
rename to sound/voice/alien/predalien/click.ogg
diff --git a/sound/voice/predalien_click1.ogg b/sound/voice/alien/predalien/click1.ogg
similarity index 100%
rename from sound/voice/predalien_click1.ogg
rename to sound/voice/alien/predalien/click1.ogg
diff --git a/sound/voice/predalien_click2.ogg b/sound/voice/alien/predalien/click2.ogg
similarity index 100%
rename from sound/voice/predalien_click2.ogg
rename to sound/voice/alien/predalien/click2.ogg
diff --git a/sound/voice/predalien_click3.ogg b/sound/voice/alien/predalien/click3.ogg
similarity index 100%
rename from sound/voice/predalien_click3.ogg
rename to sound/voice/alien/predalien/click3.ogg
diff --git a/sound/voice/predalien_death.ogg b/sound/voice/alien/predalien/death.ogg
similarity index 100%
rename from sound/voice/predalien_death.ogg
rename to sound/voice/alien/predalien/death.ogg
diff --git a/sound/voice/predalien_growl.ogg b/sound/voice/alien/predalien/growl.ogg
similarity index 100%
rename from sound/voice/predalien_growl.ogg
rename to sound/voice/alien/predalien/growl.ogg
diff --git a/sound/voice/predalien_hiss.ogg b/sound/voice/alien/predalien/hiss.ogg
similarity index 100%
rename from sound/voice/predalien_hiss.ogg
rename to sound/voice/alien/predalien/hiss.ogg
diff --git a/sound/voice/predalien_pounce.ogg b/sound/voice/alien/predalien/pounce.ogg
similarity index 100%
rename from sound/voice/predalien_pounce.ogg
rename to sound/voice/alien/predalien/pounce.ogg
diff --git a/sound/voice/predalien_roar.ogg b/sound/voice/alien/predalien/roar.ogg
similarity index 100%
rename from sound/voice/predalien_roar.ogg
rename to sound/voice/alien/predalien/roar.ogg
diff --git a/sound/voice/alien_queen_breath1.ogg b/sound/voice/alien/queen/breath1.ogg
similarity index 100%
rename from sound/voice/alien_queen_breath1.ogg
rename to sound/voice/alien/queen/breath1.ogg
diff --git a/sound/voice/alien_queen_breath2.ogg b/sound/voice/alien/queen/breath2.ogg
similarity index 100%
rename from sound/voice/alien_queen_breath2.ogg
rename to sound/voice/alien/queen/breath2.ogg
diff --git a/sound/voice/alien_queen_command.ogg b/sound/voice/alien/queen/command.ogg
similarity index 100%
rename from sound/voice/alien_queen_command.ogg
rename to sound/voice/alien/queen/command.ogg
diff --git a/sound/voice/alien_queen_command2.ogg b/sound/voice/alien/queen/command2.ogg
similarity index 100%
rename from sound/voice/alien_queen_command2.ogg
rename to sound/voice/alien/queen/command2.ogg
diff --git a/sound/voice/alien_queen_command3.ogg b/sound/voice/alien/queen/command3.ogg
similarity index 100%
rename from sound/voice/alien_queen_command3.ogg
rename to sound/voice/alien/queen/command3.ogg
diff --git a/sound/voice/alien_queen_died.ogg b/sound/voice/alien/queen/died.ogg
similarity index 100%
rename from sound/voice/alien_queen_died.ogg
rename to sound/voice/alien/queen/died.ogg
diff --git a/sound/voice/alien_queen_screech.ogg b/sound/voice/alien/queen/screech.ogg
similarity index 100%
rename from sound/voice/alien_queen_screech.ogg
rename to sound/voice/alien/queen/screech.ogg
diff --git a/sound/voice/alien_frenzy_screech.ogg b/sound/voice/alien/queen/screech_frenzy.ogg
similarity index 100%
rename from sound/voice/alien_frenzy_screech.ogg
rename to sound/voice/alien/queen/screech_frenzy.ogg
diff --git a/sound/voice/alien_heal_screech.ogg b/sound/voice/alien/queen/screech_heal.ogg
similarity index 100%
rename from sound/voice/alien_heal_screech.ogg
rename to sound/voice/alien/queen/screech_heal.ogg
diff --git a/sound/voice/alien_plasma_screech.ogg b/sound/voice/alien/queen/screech_plasma.ogg
similarity index 100%
rename from sound/voice/alien_plasma_screech.ogg
rename to sound/voice/alien/queen/screech_plasma.ogg
diff --git a/sound/voice/alien_roar1.ogg b/sound/voice/alien/roar1.ogg
similarity index 100%
rename from sound/voice/alien_roar1.ogg
rename to sound/voice/alien/roar1.ogg
diff --git a/sound/voice/alien_roar10.ogg b/sound/voice/alien/roar10.ogg
similarity index 100%
rename from sound/voice/alien_roar10.ogg
rename to sound/voice/alien/roar10.ogg
diff --git a/sound/voice/alien_roar11.ogg b/sound/voice/alien/roar11.ogg
similarity index 100%
rename from sound/voice/alien_roar11.ogg
rename to sound/voice/alien/roar11.ogg
diff --git a/sound/voice/alien_roar12.ogg b/sound/voice/alien/roar12.ogg
similarity index 100%
rename from sound/voice/alien_roar12.ogg
rename to sound/voice/alien/roar12.ogg
diff --git a/sound/voice/alien_roar2.ogg b/sound/voice/alien/roar2.ogg
similarity index 100%
rename from sound/voice/alien_roar2.ogg
rename to sound/voice/alien/roar2.ogg
diff --git a/sound/voice/alien_roar3.ogg b/sound/voice/alien/roar3.ogg
similarity index 100%
rename from sound/voice/alien_roar3.ogg
rename to sound/voice/alien/roar3.ogg
diff --git a/sound/voice/alien_roar4.ogg b/sound/voice/alien/roar4.ogg
similarity index 100%
rename from sound/voice/alien_roar4.ogg
rename to sound/voice/alien/roar4.ogg
diff --git a/sound/voice/alien_roar5.ogg b/sound/voice/alien/roar5.ogg
similarity index 100%
rename from sound/voice/alien_roar5.ogg
rename to sound/voice/alien/roar5.ogg
diff --git a/sound/voice/alien_roar6.ogg b/sound/voice/alien/roar6.ogg
similarity index 100%
rename from sound/voice/alien_roar6.ogg
rename to sound/voice/alien/roar6.ogg
diff --git a/sound/voice/alien_roar7.ogg b/sound/voice/alien/roar7.ogg
similarity index 100%
rename from sound/voice/alien_roar7.ogg
rename to sound/voice/alien/roar7.ogg
diff --git a/sound/voice/alien_roar8.ogg b/sound/voice/alien/roar8.ogg
similarity index 100%
rename from sound/voice/alien_roar8.ogg
rename to sound/voice/alien/roar8.ogg
diff --git a/sound/voice/alien_roar9.ogg b/sound/voice/alien/roar9.ogg
similarity index 100%
rename from sound/voice/alien_roar9.ogg
rename to sound/voice/alien/roar9.ogg
diff --git a/sound/voice/alien_roar_warlock.ogg b/sound/voice/alien/roar_warlock.ogg
similarity index 100%
rename from sound/voice/alien_roar_warlock.ogg
rename to sound/voice/alien/roar_warlock.ogg
diff --git a/sound/voice/alien_spitacid.ogg b/sound/voice/alien/spitacid.ogg
similarity index 100%
rename from sound/voice/alien_spitacid.ogg
rename to sound/voice/alien/spitacid.ogg
diff --git a/sound/voice/alien_spitacid2.ogg b/sound/voice/alien/spitacid2.ogg
similarity index 100%
rename from sound/voice/alien_spitacid2.ogg
rename to sound/voice/alien/spitacid2.ogg
diff --git a/sound/voice/alien_talk.ogg b/sound/voice/alien/talk.ogg
similarity index 100%
rename from sound/voice/alien_talk.ogg
rename to sound/voice/alien/talk.ogg
diff --git a/sound/voice/alien_talk2.ogg b/sound/voice/alien/talk2.ogg
similarity index 100%
rename from sound/voice/alien_talk2.ogg
rename to sound/voice/alien/talk2.ogg
diff --git a/sound/voice/alien_talk3.ogg b/sound/voice/alien/talk3.ogg
similarity index 100%
rename from sound/voice/alien_talk3.ogg
rename to sound/voice/alien/talk3.ogg
diff --git a/sound/voice/xenos_roaring.ogg b/sound/voice/alien/xenos_roaring.ogg
similarity index 100%
rename from sound/voice/xenos_roaring.ogg
rename to sound/voice/alien/xenos_roaring.ogg
diff --git a/sound/voice/alien_yell_alt.ogg b/sound/voice/alien/yell_alt.ogg
similarity index 100%
rename from sound/voice/alien_yell_alt.ogg
rename to sound/voice/alien/yell_alt.ogg
diff --git a/sound/voice/alien_cena.ogg b/sound/voice/alien_cena.ogg
deleted file mode 100644
index cf9fc6d8ea4..00000000000
Binary files a/sound/voice/alien_cena.ogg and /dev/null differ
diff --git a/sound/voice/alien_queen_xmas.ogg b/sound/voice/alien_queen_xmas.ogg
deleted file mode 100644
index 5f191ba30f5..00000000000
Binary files a/sound/voice/alien_queen_xmas.ogg and /dev/null differ
diff --git a/sound/voice/b18_activate.ogg b/sound/voice/b18/activate.ogg
similarity index 100%
rename from sound/voice/b18_activate.ogg
rename to sound/voice/b18/activate.ogg
diff --git a/sound/voice/b18_antitoxin.ogg b/sound/voice/b18/antitoxin.ogg
similarity index 100%
rename from sound/voice/b18_antitoxin.ogg
rename to sound/voice/b18/antitoxin.ogg
diff --git a/sound/voice/b18_antitoxin2.ogg b/sound/voice/b18/antitoxin2.ogg
similarity index 100%
rename from sound/voice/b18_antitoxin2.ogg
rename to sound/voice/b18/antitoxin2.ogg
diff --git a/sound/voice/b18_brute.ogg b/sound/voice/b18/brute.ogg
similarity index 100%
rename from sound/voice/b18_brute.ogg
rename to sound/voice/b18/brute.ogg
diff --git a/sound/voice/b18_fracture.ogg b/sound/voice/b18/fracture.ogg
similarity index 100%
rename from sound/voice/b18_fracture.ogg
rename to sound/voice/b18/fracture.ogg
diff --git a/sound/voice/ib_detected.ogg b/sound/voice/b18/ib_detected.ogg
similarity index 100%
rename from sound/voice/ib_detected.ogg
rename to sound/voice/b18/ib_detected.ogg
diff --git a/sound/voice/b18_pain_suppress.ogg b/sound/voice/b18/pain_suppress.ogg
similarity index 100%
rename from sound/voice/b18_pain_suppress.ogg
rename to sound/voice/b18/pain_suppress.ogg
diff --git a/sound/voice/bcreep.ogg b/sound/voice/bcreep.ogg
deleted file mode 100644
index d1d4f043be4..00000000000
Binary files a/sound/voice/bcreep.ogg and /dev/null differ
diff --git a/sound/voice/bcriminal.ogg b/sound/voice/bcriminal.ogg
deleted file mode 100644
index 36621372b9a..00000000000
Binary files a/sound/voice/bcriminal.ogg and /dev/null differ
diff --git a/sound/voice/bfreeze.ogg b/sound/voice/bfreeze.ogg
deleted file mode 100644
index de1a5014441..00000000000
Binary files a/sound/voice/bfreeze.ogg and /dev/null differ
diff --git a/sound/voice/bgod.ogg b/sound/voice/bgod.ogg
deleted file mode 100644
index 3deab990caa..00000000000
Binary files a/sound/voice/bgod.ogg and /dev/null differ
diff --git a/sound/voice/biamthelaw.ogg b/sound/voice/biamthelaw.ogg
deleted file mode 100644
index c4405b24289..00000000000
Binary files a/sound/voice/biamthelaw.ogg and /dev/null differ
diff --git a/sound/voice/binsult.ogg b/sound/voice/binsult.ogg
deleted file mode 100644
index db996283c57..00000000000
Binary files a/sound/voice/binsult.ogg and /dev/null differ
diff --git a/sound/voice/bjustice.ogg b/sound/voice/bjustice.ogg
deleted file mode 100644
index 7c93abc0f31..00000000000
Binary files a/sound/voice/bjustice.ogg and /dev/null differ
diff --git a/sound/voice/bradio.ogg b/sound/voice/bradio.ogg
deleted file mode 100644
index 7d2681f2f28..00000000000
Binary files a/sound/voice/bradio.ogg and /dev/null differ
diff --git a/sound/voice/bsecureday.ogg b/sound/voice/bsecureday.ogg
deleted file mode 100644
index 594f8a8cbc0..00000000000
Binary files a/sound/voice/bsecureday.ogg and /dev/null differ
diff --git a/sound/voice/human_female_cough1.ogg b/sound/voice/human/female/cough1.ogg
similarity index 100%
rename from sound/voice/human_female_cough1.ogg
rename to sound/voice/human/female/cough1.ogg
diff --git a/sound/voice/human_female_cough2.ogg b/sound/voice/human/female/cough2.ogg
similarity index 100%
rename from sound/voice/human_female_cough2.ogg
rename to sound/voice/human/female/cough2.ogg
diff --git a/sound/voice/human_female_cry_1.ogg b/sound/voice/human/female/cry_1.ogg
similarity index 100%
rename from sound/voice/human_female_cry_1.ogg
rename to sound/voice/human/female/cry_1.ogg
diff --git a/sound/voice/human_female_facehugged1.ogg b/sound/voice/human/female/facehugged1.ogg
similarity index 100%
rename from sound/voice/human_female_facehugged1.ogg
rename to sound/voice/human/female/facehugged1.ogg
diff --git a/sound/voice/human_female_facehugged2.ogg b/sound/voice/human/female/facehugged2.ogg
similarity index 100%
rename from sound/voice/human_female_facehugged2.ogg
rename to sound/voice/human/female/facehugged2.ogg
diff --git a/sound/voice/human_female_gasp1.ogg b/sound/voice/human/female/gasp1.ogg
similarity index 100%
rename from sound/voice/human_female_gasp1.ogg
rename to sound/voice/human/female/gasp1.ogg
diff --git a/sound/voice/human_female_gasp2.ogg b/sound/voice/human/female/gasp2.ogg
similarity index 100%
rename from sound/voice/human_female_gasp2.ogg
rename to sound/voice/human/female/gasp2.ogg
diff --git a/sound/voice/human_female_giggle_1.ogg b/sound/voice/human/female/giggle_1.ogg
similarity index 100%
rename from sound/voice/human_female_giggle_1.ogg
rename to sound/voice/human/female/giggle_1.ogg
diff --git a/sound/voice/human_female_gored_1.ogg b/sound/voice/human/female/gored_1.ogg
similarity index 100%
rename from sound/voice/human_female_gored_1.ogg
rename to sound/voice/human/female/gored_1.ogg
diff --git a/sound/voice/human_female_gored_2.ogg b/sound/voice/human/female/gored_2.ogg
similarity index 100%
rename from sound/voice/human_female_gored_2.ogg
rename to sound/voice/human/female/gored_2.ogg
diff --git a/sound/voice/human_female_grenadethrow_1.ogg b/sound/voice/human/female/grenadethrow_1.ogg
similarity index 100%
rename from sound/voice/human_female_grenadethrow_1.ogg
rename to sound/voice/human/female/grenadethrow_1.ogg
diff --git a/sound/voice/human_female_grenadethrow_2.ogg b/sound/voice/human/female/grenadethrow_2.ogg
similarity index 100%
rename from sound/voice/human_female_grenadethrow_2.ogg
rename to sound/voice/human/female/grenadethrow_2.ogg
diff --git a/sound/voice/human_female_grenadethrow_3.ogg b/sound/voice/human/female/grenadethrow_3.ogg
similarity index 100%
rename from sound/voice/human_female_grenadethrow_3.ogg
rename to sound/voice/human/female/grenadethrow_3.ogg
diff --git a/sound/voice/human_female_laugh_1.ogg b/sound/voice/human/female/laugh_1.ogg
similarity index 100%
rename from sound/voice/human_female_laugh_1.ogg
rename to sound/voice/human/female/laugh_1.ogg
diff --git a/sound/voice/human_female_medic.ogg b/sound/voice/human/female/medic.ogg
similarity index 100%
rename from sound/voice/human_female_medic.ogg
rename to sound/voice/human/female/medic.ogg
diff --git a/sound/voice/human_female_moan_1.ogg b/sound/voice/human/female/moan_1.ogg
similarity index 100%
rename from sound/voice/human_female_moan_1.ogg
rename to sound/voice/human/female/moan_1.ogg
diff --git a/sound/voice/human_female_pain_1.ogg b/sound/voice/human/female/pain_1.ogg
similarity index 100%
rename from sound/voice/human_female_pain_1.ogg
rename to sound/voice/human/female/pain_1.ogg
diff --git a/sound/voice/human_female_pain_2.ogg b/sound/voice/human/female/pain_2.ogg
similarity index 100%
rename from sound/voice/human_female_pain_2.ogg
rename to sound/voice/human/female/pain_2.ogg
diff --git a/sound/voice/human_female_pain_3.ogg b/sound/voice/human/female/pain_3.ogg
similarity index 100%
rename from sound/voice/human_female_pain_3.ogg
rename to sound/voice/human/female/pain_3.ogg
diff --git a/sound/voice/human_female_preburst1.ogg b/sound/voice/human/female/preburst1.ogg
similarity index 100%
rename from sound/voice/human_female_preburst1.ogg
rename to sound/voice/human/female/preburst1.ogg
diff --git a/sound/voice/human_female_preburst2.ogg b/sound/voice/human/female/preburst2.ogg
similarity index 100%
rename from sound/voice/human_female_preburst2.ogg
rename to sound/voice/human/female/preburst2.ogg
diff --git a/sound/voice/human_female_preburst3.ogg b/sound/voice/human/female/preburst3.ogg
similarity index 100%
rename from sound/voice/human_female_preburst3.ogg
rename to sound/voice/human/female/preburst3.ogg
diff --git a/sound/voice/human_female_scream_1.ogg b/sound/voice/human/female/scream_1.ogg
similarity index 100%
rename from sound/voice/human_female_scream_1.ogg
rename to sound/voice/human/female/scream_1.ogg
diff --git a/sound/voice/human_female_scream_2.ogg b/sound/voice/human/female/scream_2.ogg
similarity index 100%
rename from sound/voice/human_female_scream_2.ogg
rename to sound/voice/human/female/scream_2.ogg
diff --git a/sound/voice/human_female_scream_3.ogg b/sound/voice/human/female/scream_3.ogg
similarity index 100%
rename from sound/voice/human_female_scream_3.ogg
rename to sound/voice/human/female/scream_3.ogg
diff --git a/sound/voice/human_female_scream_4.ogg b/sound/voice/human/female/scream_4.ogg
similarity index 100%
rename from sound/voice/human_female_scream_4.ogg
rename to sound/voice/human/female/scream_4.ogg
diff --git a/sound/voice/human_female_scream_5.ogg b/sound/voice/human/female/scream_5.ogg
similarity index 100%
rename from sound/voice/human_female_scream_5.ogg
rename to sound/voice/human/female/scream_5.ogg
diff --git a/sound/voice/human_female_sigh_1.ogg b/sound/voice/human/female/sigh_1.ogg
similarity index 100%
rename from sound/voice/human_female_sigh_1.ogg
rename to sound/voice/human/female/sigh_1.ogg
diff --git a/sound/voice/human_female_warcry_1.ogg b/sound/voice/human/female/warcry_1.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_1.ogg
rename to sound/voice/human/female/warcry_1.ogg
diff --git a/sound/voice/human_female_warcry_10.ogg b/sound/voice/human/female/warcry_10.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_10.ogg
rename to sound/voice/human/female/warcry_10.ogg
diff --git a/sound/voice/human_female_warcry_11.ogg b/sound/voice/human/female/warcry_11.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_11.ogg
rename to sound/voice/human/female/warcry_11.ogg
diff --git a/sound/voice/human_female_warcry_12.ogg b/sound/voice/human/female/warcry_12.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_12.ogg
rename to sound/voice/human/female/warcry_12.ogg
diff --git a/sound/voice/human_female_warcry_13.ogg b/sound/voice/human/female/warcry_13.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_13.ogg
rename to sound/voice/human/female/warcry_13.ogg
diff --git a/sound/voice/human_female_warcry_14.ogg b/sound/voice/human/female/warcry_14.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_14.ogg
rename to sound/voice/human/female/warcry_14.ogg
diff --git a/sound/voice/human_female_warcry_15.ogg b/sound/voice/human/female/warcry_15.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_15.ogg
rename to sound/voice/human/female/warcry_15.ogg
diff --git a/sound/voice/human_female_warcry_16.ogg b/sound/voice/human/female/warcry_16.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_16.ogg
rename to sound/voice/human/female/warcry_16.ogg
diff --git a/sound/voice/human_female_warcry_17.ogg b/sound/voice/human/female/warcry_17.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_17.ogg
rename to sound/voice/human/female/warcry_17.ogg
diff --git a/sound/voice/human_female_warcry_18.ogg b/sound/voice/human/female/warcry_18.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_18.ogg
rename to sound/voice/human/female/warcry_18.ogg
diff --git a/sound/voice/human_female_warcry_19.ogg b/sound/voice/human/female/warcry_19.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_19.ogg
rename to sound/voice/human/female/warcry_19.ogg
diff --git a/sound/voice/human_female_warcry_2.ogg b/sound/voice/human/female/warcry_2.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_2.ogg
rename to sound/voice/human/female/warcry_2.ogg
diff --git a/sound/voice/human_female_warcry_3.ogg b/sound/voice/human/female/warcry_3.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_3.ogg
rename to sound/voice/human/female/warcry_3.ogg
diff --git a/sound/voice/human_female_warcry_4.ogg b/sound/voice/human/female/warcry_4.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_4.ogg
rename to sound/voice/human/female/warcry_4.ogg
diff --git a/sound/voice/human_female_warcry_5.ogg b/sound/voice/human/female/warcry_5.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_5.ogg
rename to sound/voice/human/female/warcry_5.ogg
diff --git a/sound/voice/human_female_warcry_6.ogg b/sound/voice/human/female/warcry_6.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_6.ogg
rename to sound/voice/human/female/warcry_6.ogg
diff --git a/sound/voice/human_female_warcry_7.ogg b/sound/voice/human/female/warcry_7.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_7.ogg
rename to sound/voice/human/female/warcry_7.ogg
diff --git a/sound/voice/human_female_warcry_8.ogg b/sound/voice/human/female/warcry_8.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_8.ogg
rename to sound/voice/human/female/warcry_8.ogg
diff --git a/sound/voice/human_female_warcry_9.ogg b/sound/voice/human/female/warcry_9.ogg
similarity index 100%
rename from sound/voice/human_female_warcry_9.ogg
rename to sound/voice/human/female/warcry_9.ogg
diff --git a/sound/voice/human_female_yawn_1.ogg b/sound/voice/human/female/yawn_1.ogg
similarity index 100%
rename from sound/voice/human_female_yawn_1.ogg
rename to sound/voice/human/female/yawn_1.ogg
diff --git a/sound/voice/human_male_cough1.ogg b/sound/voice/human/male/cough1.ogg
similarity index 100%
rename from sound/voice/human_male_cough1.ogg
rename to sound/voice/human/male/cough1.ogg
diff --git a/sound/voice/human_male_cough2.ogg b/sound/voice/human/male/cough2.ogg
similarity index 100%
rename from sound/voice/human_male_cough2.ogg
rename to sound/voice/human/male/cough2.ogg
diff --git a/sound/voice/human_male_cry_1.ogg b/sound/voice/human/male/cry_1.ogg
similarity index 100%
rename from sound/voice/human_male_cry_1.ogg
rename to sound/voice/human/male/cry_1.ogg
diff --git a/sound/voice/human_male_facehugged1.ogg b/sound/voice/human/male/facehugged1.ogg
similarity index 100%
rename from sound/voice/human_male_facehugged1.ogg
rename to sound/voice/human/male/facehugged1.ogg
diff --git a/sound/voice/human_male_facehugged2.ogg b/sound/voice/human/male/facehugged2.ogg
similarity index 100%
rename from sound/voice/human_male_facehugged2.ogg
rename to sound/voice/human/male/facehugged2.ogg
diff --git a/sound/voice/human_male_facehugged3.ogg b/sound/voice/human/male/facehugged3.ogg
similarity index 100%
rename from sound/voice/human_male_facehugged3.ogg
rename to sound/voice/human/male/facehugged3.ogg
diff --git a/sound/voice/human_male_gasp1.ogg b/sound/voice/human/male/gasp1.ogg
similarity index 100%
rename from sound/voice/human_male_gasp1.ogg
rename to sound/voice/human/male/gasp1.ogg
diff --git a/sound/voice/human_male_gasp2.ogg b/sound/voice/human/male/gasp2.ogg
similarity index 100%
rename from sound/voice/human_male_gasp2.ogg
rename to sound/voice/human/male/gasp2.ogg
diff --git a/sound/voice/human_male_gasp3.ogg b/sound/voice/human/male/gasp3.ogg
similarity index 100%
rename from sound/voice/human_male_gasp3.ogg
rename to sound/voice/human/male/gasp3.ogg
diff --git a/sound/voice/human_male_giggle_1.ogg b/sound/voice/human/male/giggle_1.ogg
similarity index 100%
rename from sound/voice/human_male_giggle_1.ogg
rename to sound/voice/human/male/giggle_1.ogg
diff --git a/sound/voice/human_male_gored3.ogg b/sound/voice/human/male/gored3.ogg
similarity index 100%
rename from sound/voice/human_male_gored3.ogg
rename to sound/voice/human/male/gored3.ogg
diff --git a/sound/voice/human_male_gored_1.ogg b/sound/voice/human/male/gored_1.ogg
similarity index 100%
rename from sound/voice/human_male_gored_1.ogg
rename to sound/voice/human/male/gored_1.ogg
diff --git a/sound/voice/human_male_gored_2.ogg b/sound/voice/human/male/gored_2.ogg
similarity index 100%
rename from sound/voice/human_male_gored_2.ogg
rename to sound/voice/human/male/gored_2.ogg
diff --git a/sound/voice/human_male_grenadethrow_1.ogg b/sound/voice/human/male/grenadethrow_1.ogg
similarity index 100%
rename from sound/voice/human_male_grenadethrow_1.ogg
rename to sound/voice/human/male/grenadethrow_1.ogg
diff --git a/sound/voice/human_male_grenadethrow_2.ogg b/sound/voice/human/male/grenadethrow_2.ogg
similarity index 100%
rename from sound/voice/human_male_grenadethrow_2.ogg
rename to sound/voice/human/male/grenadethrow_2.ogg
diff --git a/sound/voice/human_male_grenadethrow_3.ogg b/sound/voice/human/male/grenadethrow_3.ogg
similarity index 100%
rename from sound/voice/human_male_grenadethrow_3.ogg
rename to sound/voice/human/male/grenadethrow_3.ogg
diff --git a/sound/voice/human_male_laugh_1.ogg b/sound/voice/human/male/laugh_1.ogg
similarity index 100%
rename from sound/voice/human_male_laugh_1.ogg
rename to sound/voice/human/male/laugh_1.ogg
diff --git a/sound/voice/human_male_laugh_2.ogg b/sound/voice/human/male/laugh_2.ogg
similarity index 100%
rename from sound/voice/human_male_laugh_2.ogg
rename to sound/voice/human/male/laugh_2.ogg
diff --git a/sound/voice/human_male_medic.ogg b/sound/voice/human/male/medic.ogg
similarity index 100%
rename from sound/voice/human_male_medic.ogg
rename to sound/voice/human/male/medic.ogg
diff --git a/sound/voice/human_male_medic2.ogg b/sound/voice/human/male/medic2.ogg
similarity index 100%
rename from sound/voice/human_male_medic2.ogg
rename to sound/voice/human/male/medic2.ogg
diff --git a/sound/voice/human_male_moan_1.ogg b/sound/voice/human/male/moan_1.ogg
similarity index 100%
rename from sound/voice/human_male_moan_1.ogg
rename to sound/voice/human/male/moan_1.ogg
diff --git a/sound/voice/human_male_pain_1.ogg b/sound/voice/human/male/pain_1.ogg
similarity index 100%
rename from sound/voice/human_male_pain_1.ogg
rename to sound/voice/human/male/pain_1.ogg
diff --git a/sound/voice/human_male_pain_10.ogg b/sound/voice/human/male/pain_10.ogg
similarity index 100%
rename from sound/voice/human_male_pain_10.ogg
rename to sound/voice/human/male/pain_10.ogg
diff --git a/sound/voice/human_male_pain_11.ogg b/sound/voice/human/male/pain_11.ogg
similarity index 100%
rename from sound/voice/human_male_pain_11.ogg
rename to sound/voice/human/male/pain_11.ogg
diff --git a/sound/voice/human_male_pain_2.ogg b/sound/voice/human/male/pain_2.ogg
similarity index 100%
rename from sound/voice/human_male_pain_2.ogg
rename to sound/voice/human/male/pain_2.ogg
diff --git a/sound/voice/human_male_pain_3.ogg b/sound/voice/human/male/pain_3.ogg
similarity index 100%
rename from sound/voice/human_male_pain_3.ogg
rename to sound/voice/human/male/pain_3.ogg
diff --git a/sound/voice/human_male_pain_4.ogg b/sound/voice/human/male/pain_4.ogg
similarity index 100%
rename from sound/voice/human_male_pain_4.ogg
rename to sound/voice/human/male/pain_4.ogg
diff --git a/sound/voice/human_male_pain_5.ogg b/sound/voice/human/male/pain_5.ogg
similarity index 100%
rename from sound/voice/human_male_pain_5.ogg
rename to sound/voice/human/male/pain_5.ogg
diff --git a/sound/voice/human_male_pain_6.ogg b/sound/voice/human/male/pain_6.ogg
similarity index 100%
rename from sound/voice/human_male_pain_6.ogg
rename to sound/voice/human/male/pain_6.ogg
diff --git a/sound/voice/human_male_pain_7.ogg b/sound/voice/human/male/pain_7.ogg
similarity index 100%
rename from sound/voice/human_male_pain_7.ogg
rename to sound/voice/human/male/pain_7.ogg
diff --git a/sound/voice/human_male_pain_8.ogg b/sound/voice/human/male/pain_8.ogg
similarity index 100%
rename from sound/voice/human_male_pain_8.ogg
rename to sound/voice/human/male/pain_8.ogg
diff --git a/sound/voice/human_male_pain_9.ogg b/sound/voice/human/male/pain_9.ogg
similarity index 100%
rename from sound/voice/human_male_pain_9.ogg
rename to sound/voice/human/male/pain_9.ogg
diff --git a/sound/voice/human_male_preburst1.ogg b/sound/voice/human/male/preburst1.ogg
similarity index 100%
rename from sound/voice/human_male_preburst1.ogg
rename to sound/voice/human/male/preburst1.ogg
diff --git a/sound/voice/human_male_preburst10.ogg b/sound/voice/human/male/preburst10.ogg
similarity index 100%
rename from sound/voice/human_male_preburst10.ogg
rename to sound/voice/human/male/preburst10.ogg
diff --git a/sound/voice/human_male_preburst2.ogg b/sound/voice/human/male/preburst2.ogg
similarity index 100%
rename from sound/voice/human_male_preburst2.ogg
rename to sound/voice/human/male/preburst2.ogg
diff --git a/sound/voice/human_male_preburst3.ogg b/sound/voice/human/male/preburst3.ogg
similarity index 100%
rename from sound/voice/human_male_preburst3.ogg
rename to sound/voice/human/male/preburst3.ogg
diff --git a/sound/voice/human_male_preburst4.ogg b/sound/voice/human/male/preburst4.ogg
similarity index 100%
rename from sound/voice/human_male_preburst4.ogg
rename to sound/voice/human/male/preburst4.ogg
diff --git a/sound/voice/human_male_preburst5.ogg b/sound/voice/human/male/preburst5.ogg
similarity index 100%
rename from sound/voice/human_male_preburst5.ogg
rename to sound/voice/human/male/preburst5.ogg
diff --git a/sound/voice/human_male_preburst6.ogg b/sound/voice/human/male/preburst6.ogg
similarity index 100%
rename from sound/voice/human_male_preburst6.ogg
rename to sound/voice/human/male/preburst6.ogg
diff --git a/sound/voice/human_male_preburst7.ogg b/sound/voice/human/male/preburst7.ogg
similarity index 100%
rename from sound/voice/human_male_preburst7.ogg
rename to sound/voice/human/male/preburst7.ogg
diff --git a/sound/voice/human_male_preburst8.ogg b/sound/voice/human/male/preburst8.ogg
similarity index 100%
rename from sound/voice/human_male_preburst8.ogg
rename to sound/voice/human/male/preburst8.ogg
diff --git a/sound/voice/human_male_preburst9.ogg b/sound/voice/human/male/preburst9.ogg
similarity index 100%
rename from sound/voice/human_male_preburst9.ogg
rename to sound/voice/human/male/preburst9.ogg
diff --git a/sound/voice/human_male_scream_1.ogg b/sound/voice/human/male/scream_1.ogg
similarity index 100%
rename from sound/voice/human_male_scream_1.ogg
rename to sound/voice/human/male/scream_1.ogg
diff --git a/sound/voice/human_male_scream_2.ogg b/sound/voice/human/male/scream_2.ogg
similarity index 100%
rename from sound/voice/human_male_scream_2.ogg
rename to sound/voice/human/male/scream_2.ogg
diff --git a/sound/voice/human_male_scream_3.ogg b/sound/voice/human/male/scream_3.ogg
similarity index 100%
rename from sound/voice/human_male_scream_3.ogg
rename to sound/voice/human/male/scream_3.ogg
diff --git a/sound/voice/human_male_scream_4.ogg b/sound/voice/human/male/scream_4.ogg
similarity index 100%
rename from sound/voice/human_male_scream_4.ogg
rename to sound/voice/human/male/scream_4.ogg
diff --git a/sound/voice/human_male_scream_5.ogg b/sound/voice/human/male/scream_5.ogg
similarity index 100%
rename from sound/voice/human_male_scream_5.ogg
rename to sound/voice/human/male/scream_5.ogg
diff --git a/sound/voice/human_male_scream_6.ogg b/sound/voice/human/male/scream_6.ogg
similarity index 100%
rename from sound/voice/human_male_scream_6.ogg
rename to sound/voice/human/male/scream_6.ogg
diff --git a/sound/voice/human_male_scream_7.ogg b/sound/voice/human/male/scream_7.ogg
similarity index 100%
rename from sound/voice/human_male_scream_7.ogg
rename to sound/voice/human/male/scream_7.ogg
diff --git a/sound/voice/human_male_sigh_1.ogg b/sound/voice/human/male/sigh_1.ogg
similarity index 100%
rename from sound/voice/human_male_sigh_1.ogg
rename to sound/voice/human/male/sigh_1.ogg
diff --git a/sound/voice/human_male_warcry_1.ogg b/sound/voice/human/male/warcry_1.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_1.ogg
rename to sound/voice/human/male/warcry_1.ogg
diff --git a/sound/voice/human_male_warcry_10.ogg b/sound/voice/human/male/warcry_10.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_10.ogg
rename to sound/voice/human/male/warcry_10.ogg
diff --git a/sound/voice/human_male_warcry_11.ogg b/sound/voice/human/male/warcry_11.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_11.ogg
rename to sound/voice/human/male/warcry_11.ogg
diff --git a/sound/voice/human_male_warcry_12.ogg b/sound/voice/human/male/warcry_12.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_12.ogg
rename to sound/voice/human/male/warcry_12.ogg
diff --git a/sound/voice/human_male_warcry_13.ogg b/sound/voice/human/male/warcry_13.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_13.ogg
rename to sound/voice/human/male/warcry_13.ogg
diff --git a/sound/voice/human_male_warcry_14.ogg b/sound/voice/human/male/warcry_14.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_14.ogg
rename to sound/voice/human/male/warcry_14.ogg
diff --git a/sound/voice/human_male_warcry_15.ogg b/sound/voice/human/male/warcry_15.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_15.ogg
rename to sound/voice/human/male/warcry_15.ogg
diff --git a/sound/voice/human_male_warcry_16.ogg b/sound/voice/human/male/warcry_16.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_16.ogg
rename to sound/voice/human/male/warcry_16.ogg
diff --git a/sound/voice/human_male_warcry_17.ogg b/sound/voice/human/male/warcry_17.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_17.ogg
rename to sound/voice/human/male/warcry_17.ogg
diff --git a/sound/voice/human_male_warcry_18.ogg b/sound/voice/human/male/warcry_18.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_18.ogg
rename to sound/voice/human/male/warcry_18.ogg
diff --git a/sound/voice/human_male_warcry_19.ogg b/sound/voice/human/male/warcry_19.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_19.ogg
rename to sound/voice/human/male/warcry_19.ogg
diff --git a/sound/voice/human_male_warcry_2.ogg b/sound/voice/human/male/warcry_2.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_2.ogg
rename to sound/voice/human/male/warcry_2.ogg
diff --git a/sound/voice/human_male_warcry_20.ogg b/sound/voice/human/male/warcry_20.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_20.ogg
rename to sound/voice/human/male/warcry_20.ogg
diff --git a/sound/voice/human_male_warcry_21.ogg b/sound/voice/human/male/warcry_21.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_21.ogg
rename to sound/voice/human/male/warcry_21.ogg
diff --git a/sound/voice/human_male_warcry_22.ogg b/sound/voice/human/male/warcry_22.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_22.ogg
rename to sound/voice/human/male/warcry_22.ogg
diff --git a/sound/voice/human_male_warcry_23.ogg b/sound/voice/human/male/warcry_23.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_23.ogg
rename to sound/voice/human/male/warcry_23.ogg
diff --git a/sound/voice/human_male_warcry_24.ogg b/sound/voice/human/male/warcry_24.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_24.ogg
rename to sound/voice/human/male/warcry_24.ogg
diff --git a/sound/voice/human_male_warcry_25.ogg b/sound/voice/human/male/warcry_25.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_25.ogg
rename to sound/voice/human/male/warcry_25.ogg
diff --git a/sound/voice/human_male_warcry_26.ogg b/sound/voice/human/male/warcry_26.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_26.ogg
rename to sound/voice/human/male/warcry_26.ogg
diff --git a/sound/voice/human_male_warcry_27.ogg b/sound/voice/human/male/warcry_27.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_27.ogg
rename to sound/voice/human/male/warcry_27.ogg
diff --git a/sound/voice/human_male_warcry_28.ogg b/sound/voice/human/male/warcry_28.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_28.ogg
rename to sound/voice/human/male/warcry_28.ogg
diff --git a/sound/voice/human_male_warcry_29.ogg b/sound/voice/human/male/warcry_29.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_29.ogg
rename to sound/voice/human/male/warcry_29.ogg
diff --git a/sound/voice/human_male_warcry_3.ogg b/sound/voice/human/male/warcry_3.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_3.ogg
rename to sound/voice/human/male/warcry_3.ogg
diff --git a/sound/voice/human_male_warcry_4.ogg b/sound/voice/human/male/warcry_4.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_4.ogg
rename to sound/voice/human/male/warcry_4.ogg
diff --git a/sound/voice/human_male_warcry_5.ogg b/sound/voice/human/male/warcry_5.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_5.ogg
rename to sound/voice/human/male/warcry_5.ogg
diff --git a/sound/voice/human_male_warcry_6.ogg b/sound/voice/human/male/warcry_6.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_6.ogg
rename to sound/voice/human/male/warcry_6.ogg
diff --git a/sound/voice/human_male_warcry_7.ogg b/sound/voice/human/male/warcry_7.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_7.ogg
rename to sound/voice/human/male/warcry_7.ogg
diff --git a/sound/voice/human_male_warcry_8.ogg b/sound/voice/human/male/warcry_8.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_8.ogg
rename to sound/voice/human/male/warcry_8.ogg
diff --git a/sound/voice/human_male_warcry_9.ogg b/sound/voice/human/male/warcry_9.ogg
similarity index 100%
rename from sound/voice/human_male_warcry_9.ogg
rename to sound/voice/human/male/warcry_9.ogg
diff --git a/sound/voice/human_male_yawn_1.ogg b/sound/voice/human/male/yawn_1.ogg
similarity index 100%
rename from sound/voice/human_male_yawn_1.ogg
rename to sound/voice/human/male/yawn_1.ogg
diff --git a/sound/voice/sound_voice_human_whistle1.ogg b/sound/voice/human/whistle1.ogg
similarity index 100%
rename from sound/voice/sound_voice_human_whistle1.ogg
rename to sound/voice/human/whistle1.ogg
diff --git a/sound/voice/liveagain.ogg b/sound/voice/liveagain.ogg
deleted file mode 100644
index c2c1df9bc37..00000000000
Binary files a/sound/voice/liveagain.ogg and /dev/null differ
diff --git a/sound/voice/pred_anytime.ogg b/sound/voice/predator/anytime.ogg
similarity index 100%
rename from sound/voice/pred_anytime.ogg
rename to sound/voice/predator/anytime.ogg
diff --git a/sound/voice/pred_click1.ogg b/sound/voice/predator/click1.ogg
similarity index 100%
rename from sound/voice/pred_click1.ogg
rename to sound/voice/predator/click1.ogg
diff --git a/sound/voice/pred_click2.ogg b/sound/voice/predator/click2.ogg
similarity index 100%
rename from sound/voice/pred_click2.ogg
rename to sound/voice/predator/click2.ogg
diff --git a/sound/voice/pred_click3.ogg b/sound/voice/predator/click3.ogg
similarity index 100%
rename from sound/voice/pred_click3.ogg
rename to sound/voice/predator/click3.ogg
diff --git a/sound/voice/pred_click4.ogg b/sound/voice/predator/click4.ogg
similarity index 100%
rename from sound/voice/pred_click4.ogg
rename to sound/voice/predator/click4.ogg
diff --git a/sound/voice/pred_click5.ogg b/sound/voice/predator/click5.ogg
similarity index 100%
rename from sound/voice/pred_click5.ogg
rename to sound/voice/predator/click5.ogg
diff --git a/sound/voice/pred_come_on_out.ogg b/sound/voice/predator/come_on_out.ogg
similarity index 100%
rename from sound/voice/pred_come_on_out.ogg
rename to sound/voice/predator/come_on_out.ogg
diff --git a/sound/voice/pred_deathlaugh.ogg b/sound/voice/predator/deathlaugh.ogg
similarity index 100%
rename from sound/voice/pred_deathlaugh.ogg
rename to sound/voice/predator/deathlaugh.ogg
diff --git a/sound/voice/pred_facehugged.ogg b/sound/voice/predator/facehugged.ogg
similarity index 100%
rename from sound/voice/pred_facehugged.ogg
rename to sound/voice/predator/facehugged.ogg
diff --git a/sound/voice/pred_helpme.ogg b/sound/voice/predator/helpme.ogg
similarity index 100%
rename from sound/voice/pred_helpme.ogg
rename to sound/voice/predator/helpme.ogg
diff --git a/sound/voice/pred_itsatrap.ogg b/sound/voice/predator/itsatrap.ogg
similarity index 100%
rename from sound/voice/pred_itsatrap.ogg
rename to sound/voice/predator/itsatrap.ogg
diff --git a/sound/voice/pred_laugh1.ogg b/sound/voice/predator/laugh1.ogg
similarity index 100%
rename from sound/voice/pred_laugh1.ogg
rename to sound/voice/predator/laugh1.ogg
diff --git a/sound/voice/pred_laugh2.ogg b/sound/voice/predator/laugh2.ogg
similarity index 100%
rename from sound/voice/pred_laugh2.ogg
rename to sound/voice/predator/laugh2.ogg
diff --git a/sound/voice/pred_laugh3.ogg b/sound/voice/predator/laugh3.ogg
similarity index 100%
rename from sound/voice/pred_laugh3.ogg
rename to sound/voice/predator/laugh3.ogg
diff --git a/sound/voice/pred_laugh4.ogg b/sound/voice/predator/laugh4.ogg
similarity index 100%
rename from sound/voice/pred_laugh4.ogg
rename to sound/voice/predator/laugh4.ogg
diff --git a/sound/voice/pred_over_there.ogg b/sound/voice/predator/over_there.ogg
similarity index 100%
rename from sound/voice/pred_over_there.ogg
rename to sound/voice/predator/over_there.ogg
diff --git a/sound/voice/pred_overhere.ogg b/sound/voice/predator/overhere.ogg
similarity index 100%
rename from sound/voice/pred_overhere.ogg
rename to sound/voice/predator/overhere.ogg
diff --git a/sound/voice/pred_pain1.ogg b/sound/voice/predator/pain1.ogg
similarity index 100%
rename from sound/voice/pred_pain1.ogg
rename to sound/voice/predator/pain1.ogg
diff --git a/sound/voice/pred_pain2.ogg b/sound/voice/predator/pain2.ogg
similarity index 100%
rename from sound/voice/pred_pain2.ogg
rename to sound/voice/predator/pain2.ogg
diff --git a/sound/voice/pred_pain3.ogg b/sound/voice/predator/pain3.ogg
similarity index 100%
rename from sound/voice/pred_pain3.ogg
rename to sound/voice/predator/pain3.ogg
diff --git a/sound/voice/pred_pain4.ogg b/sound/voice/predator/pain4.ogg
similarity index 100%
rename from sound/voice/pred_pain4.ogg
rename to sound/voice/predator/pain4.ogg
diff --git a/sound/voice/pred_pain5.ogg b/sound/voice/predator/pain5.ogg
similarity index 100%
rename from sound/voice/pred_pain5.ogg
rename to sound/voice/predator/pain5.ogg
diff --git a/sound/voice/pred_pain_rare1.ogg b/sound/voice/predator/pain_rare1.ogg
similarity index 100%
rename from sound/voice/pred_pain_rare1.ogg
rename to sound/voice/predator/pain_rare1.ogg
diff --git a/sound/voice/pred_roar1.ogg b/sound/voice/predator/roar1.ogg
similarity index 100%
rename from sound/voice/pred_roar1.ogg
rename to sound/voice/predator/roar1.ogg
diff --git a/sound/voice/pred_roar2.ogg b/sound/voice/predator/roar2.ogg
similarity index 100%
rename from sound/voice/pred_roar2.ogg
rename to sound/voice/predator/roar2.ogg
diff --git a/sound/voice/pred_roar3.ogg b/sound/voice/predator/roar3.ogg
similarity index 100%
rename from sound/voice/pred_roar3.ogg
rename to sound/voice/predator/roar3.ogg
diff --git a/sound/voice/pred_roar4.ogg b/sound/voice/predator/roar4.ogg
similarity index 100%
rename from sound/voice/pred_roar4.ogg
rename to sound/voice/predator/roar4.ogg
diff --git a/sound/voice/pred_roar5.ogg b/sound/voice/predator/roar5.ogg
similarity index 100%
rename from sound/voice/pred_roar5.ogg
rename to sound/voice/predator/roar5.ogg
diff --git a/sound/voice/pred_turnaround.ogg b/sound/voice/predator/turnaround.ogg
similarity index 100%
rename from sound/voice/pred_turnaround.ogg
rename to sound/voice/predator/turnaround.ogg
diff --git a/sound/voice/pred_ugly_freak.ogg b/sound/voice/predator/ugly_freak.ogg
similarity index 100%
rename from sound/voice/pred_ugly_freak.ogg
rename to sound/voice/predator/ugly_freak.ogg
diff --git a/sound/voice/pred_warcry.ogg b/sound/voice/predator/warcry.ogg
similarity index 100%
rename from sound/voice/pred_warcry.ogg
rename to sound/voice/predator/warcry.ogg