From d48f1aad8ac18b7edd8b6063234a386e304f4a91 Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Thu, 7 Nov 2019 00:48:56 +0100
Subject: [PATCH] Yea, moving a few of them to voices. Do you vocalize?

---
 modular_citadel/code/game/objects/items.dm   |   2 +-
 modular_citadel/code/modules/admin/admin.dm  |   4 ++--
 sound/{misc => voice/human}/cheekibreeki.ogg | Bin
 sound/{misc => voice/human}/cyka1.ogg        | Bin
 sound/{misc => voice}/manup.ogg              | Bin
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename sound/{misc => voice/human}/cheekibreeki.ogg (100%)
 rename sound/{misc => voice/human}/cyka1.ogg (100%)
 rename sound/{misc => voice}/manup.ogg (100%)

diff --git a/modular_citadel/code/game/objects/items.dm b/modular_citadel/code/game/objects/items.dm
index c94923f9de..dba460414e 100644
--- a/modular_citadel/code/game/objects/items.dm
+++ b/modular_citadel/code/game/objects/items.dm
@@ -9,7 +9,7 @@
 	alternate_screams = list('modular_citadel/sound/voice/scream_silicon.ogg')
 
 /obj/item/clothing/head/ushanka
-	alternate_screams = list('modular_citadel/sound/misc/cyka1.ogg', 'modular_citadel/sound/misc/cheekibreeki.ogg')
+	alternate_screams = list('sound/voice/human/cyka1.ogg', 'sound/voice/human/cheekibreeki.ogg')
 
 /obj/item/proc/grenade_prime_react(obj/item/grenade/nade)
 	return
\ No newline at end of file
diff --git a/modular_citadel/code/modules/admin/admin.dm b/modular_citadel/code/modules/admin/admin.dm
index 52c787dbdb..529d0c79ec 100644
--- a/modular_citadel/code/modules/admin/admin.dm
+++ b/modular_citadel/code/modules/admin/admin.dm
@@ -15,7 +15,7 @@
 		return
 
 	to_chat(M, "<span class='warning bold reallybig'>Man up, and deal with it.</span><br><span class='warning big'>Move on.</span>")
-	M.playsound_local(M, 'modular_citadel/sound/misc/manup.ogg', 50, FALSE, pressure_affected = FALSE)
+	M.playsound_local(M, 'sound/voice/manup.ogg', 50, FALSE, pressure_affected = FALSE)
 
 	log_admin("Man up: [key_name(usr)] told [key_name(M)] to man up")
 	var/message = "<span class='adminnotice'>[key_name_admin(usr)] told [key_name_admin(M)] to man up.</span>"
@@ -32,7 +32,7 @@
 
 	to_chat(world, "<span class='warning bold reallybig'>Man up, and deal with it.</span><br><span class='warning big'>Move on.</span>")
 	for(var/mob/M in GLOB.player_list)
-		M.playsound_local(M, 'modular_citadel/sound/misc/manup.ogg', 50, FALSE, pressure_affected = FALSE)
+		M.playsound_local(M, 'sound/voice/manup.ogg', 50, FALSE, pressure_affected = FALSE)
 
 	log_admin("Man up global: [key_name(usr)] told everybody to man up")
 	message_admins("<span class='adminnotice'>[key_name_admin(usr)] told everybody to man up.</span>")
diff --git a/sound/misc/cheekibreeki.ogg b/sound/voice/human/cheekibreeki.ogg
similarity index 100%
rename from sound/misc/cheekibreeki.ogg
rename to sound/voice/human/cheekibreeki.ogg
diff --git a/sound/misc/cyka1.ogg b/sound/voice/human/cyka1.ogg
similarity index 100%
rename from sound/misc/cyka1.ogg
rename to sound/voice/human/cyka1.ogg
diff --git a/sound/misc/manup.ogg b/sound/voice/manup.ogg
similarity index 100%
rename from sound/misc/manup.ogg
rename to sound/voice/manup.ogg