diff --git a/code/modules/antagonists/roguetown/villain/maniac/maniac.dm b/code/modules/antagonists/roguetown/villain/maniac/maniac.dm index 3021c796..b2c1c6e2 100644 --- a/code/modules/antagonists/roguetown/villain/maniac/maniac.dm +++ b/code/modules/antagonists/roguetown/villain/maniac/maniac.dm @@ -91,7 +91,7 @@ if(owner.current) if(ishuman(owner.current)) var/mob/living/carbon/human/dreamer = owner.current - dreamer.cmode_music = 'sound/music/combat_maniac2.ogg' + dreamer.cmode_music = 'sound/music/combatmusic/CombatManiac.ogg' owner.adjust_skillrank(/datum/skill/combat/knives, 6, TRUE) owner.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) owner.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) diff --git a/code/modules/antagonists/roguetown/villain/vampire.dm b/code/modules/antagonists/roguetown/villain/vampire.dm index 764ecf39..6cab10ca 100644 --- a/code/modules/antagonists/roguetown/villain/vampire.dm +++ b/code/modules/antagonists/roguetown/villain/vampire.dm @@ -67,7 +67,7 @@ ADD_TRAIT(owner.current, TRAIT_TOXIMMUNE, TRAIT_GENERIC) ADD_TRAIT(owner.current, TRAIT_STEELHEARTED, TRAIT_GENERIC) ADD_TRAIT(owner.current, TRAIT_LIMPDICK, TRAIT_GENERIC) - owner.current.cmode_music = 'sound/music/combat_vamp2.ogg' + owner.current.cmode_music = 'sound/music/combatmusic/CombatVampireThrall.ogg' // YEAH WHADDUP BABY var/obj/item/organ/eyes/eyes = owner.current.getorganslot(ORGAN_SLOT_EYES) if(eyes) eyes.Remove(owner.current,1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm index 6cb66682..be2cb69d 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm @@ -15,6 +15,7 @@ ) outfit = /datum/outfit/job/roguetown/adventurer/monk traits_applied = list(TRAIT_DODGEEXPERT) + cmode_music = 'sound/music/combatmusic/CombatMonk.ogg' vampcompat = FALSE diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm index 7cc6fd56..b8271caa 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm @@ -13,6 +13,7 @@ ) outfit = /datum/outfit/job/roguetown/adventurer/ranger traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_DODGEEXPERT) + cmode_music = 'sound/music/combatmusic/CombatRanger.ogg' category_tags = list(CTAG_ADVENTURER) /datum/outfit/job/roguetown/adventurer/ranger/pre_equip(mob/living/carbon/human/H) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm index 06ad804e..4c9fe468 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm @@ -10,6 +10,7 @@ pickprob = 11 traits_applied = list(TRAIT_MEDIUMARMOR) category_tags = list(CTAG_ADVENTURER) + cmode_music = 'sound/music/combatmusic/CombatWitchHunter.ogg' /datum/outfit/job/roguetown/adventurer/puritan allowed_patrons = list(/datum/patron/old_god) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm index a9e63169..9770f0bc 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm @@ -15,6 +15,7 @@ ) outfit = /datum/outfit/job/roguetown/adventurer/rogue traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_DODGEEXPERT) + cmode_music = 'sound/music/combatmusic/CombatThief.ogg' category_tags = list(CTAG_ADVENTURER) /datum/outfit/job/roguetown/adventurer/rogue diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm index 46176c5f..9c57fe69 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm @@ -16,6 +16,7 @@ ) outfit = /datum/outfit/job/roguetown/adventurer/sfighter traits_applied = list(TRAIT_HEAVYARMOR) + cmode_music = 'sound/music/combatmusic/CombatWarrior.ogg' category_tags = list(CTAG_ADVENTURER) diff --git a/code/modules/jobs/job_types/roguetown/church/monk.dm b/code/modules/jobs/job_types/roguetown/church/monk.dm index ed8ffa3b..8cc84a2a 100644 --- a/code/modules/jobs/job_types/roguetown/church/monk.dm +++ b/code/modules/jobs/job_types/roguetown/church/monk.dm @@ -21,6 +21,7 @@ give_bank_account = TRUE min_pq = 0 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatAcolyte.ogg' /datum/outfit/job/roguetown/monk name = "Acolyte" diff --git a/code/modules/jobs/job_types/roguetown/church/mortician.dm b/code/modules/jobs/job_types/roguetown/church/mortician.dm index b440d72e..16c509e8 100644 --- a/code/modules/jobs/job_types/roguetown/church/mortician.dm +++ b/code/modules/jobs/job_types/roguetown/church/mortician.dm @@ -25,6 +25,7 @@ give_bank_account = TRUE min_pq = -5 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatMortician.ogg' /datum/outfit/job/roguetown/undertaker allowed_patrons = list(/datum/patron/divine/necra) diff --git a/code/modules/jobs/job_types/roguetown/church/priest.dm b/code/modules/jobs/job_types/roguetown/church/priest.dm index 71f321eb..b594ad9a 100644 --- a/code/modules/jobs/job_types/roguetown/church/priest.dm +++ b/code/modules/jobs/job_types/roguetown/church/priest.dm @@ -22,6 +22,7 @@ give_bank_account = 115 min_pq = 2 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatPriest.ogg' /datum/outfit/job/roguetown/priest allowed_patrons = list(/datum/patron/divine/astrata) diff --git a/code/modules/jobs/job_types/roguetown/church/puritan.dm b/code/modules/jobs/job_types/roguetown/church/puritan.dm index 05fbbe93..b00d84f7 100644 --- a/code/modules/jobs/job_types/roguetown/church/puritan.dm +++ b/code/modules/jobs/job_types/roguetown/church/puritan.dm @@ -29,6 +29,7 @@ give_bank_account = 36 min_pq = 5 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatInquisitor.ogg' /datum/job/roguetown/puritan/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/courtier/butler.dm b/code/modules/jobs/job_types/roguetown/courtier/butler.dm index 0ff0f4ff..d6c43cf1 100644 --- a/code/modules/jobs/job_types/roguetown/courtier/butler.dm +++ b/code/modules/jobs/job_types/roguetown/courtier/butler.dm @@ -26,6 +26,7 @@ give_bank_account = 5 min_pq = -10 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatButler.ogg' /datum/outfit/job/roguetown/butler/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/courtier/jester.dm b/code/modules/jobs/job_types/roguetown/courtier/jester.dm index 53804ca7..73b8d250 100644 --- a/code/modules/jobs/job_types/roguetown/courtier/jester.dm +++ b/code/modules/jobs/job_types/roguetown/courtier/jester.dm @@ -56,7 +56,14 @@ H.STASTR = rand(1, 20) H.STAINT = rand(1, 20) H.STALUC = rand(1, 20) - H.cmode_music = 'sound/music/combat_jester.ogg' + H.cmode_music = pick( + prob(50) + "sound/music/combatmusic/CombatJester1.ogg", + prob(45) + "sound/music/combatmusic/CombatJester2.ogg", + prob(5) + "sound/music/combatmusic/CombatJester3.ogg" + ) /* if(H.gender == MALE) if(H.dna?.species) diff --git a/code/modules/jobs/job_types/roguetown/courtier/magician.dm b/code/modules/jobs/job_types/roguetown/courtier/magician.dm index 51419307..c77204c6 100644 --- a/code/modules/jobs/job_types/roguetown/courtier/magician.dm +++ b/code/modules/jobs/job_types/roguetown/courtier/magician.dm @@ -23,6 +23,7 @@ give_bank_account = 47 min_pq = 2 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatCourtMage.ogg' /datum/outfit/job/roguetown/magician allowed_patrons = list(/datum/patron/divine/noc) diff --git a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm index a2a975a4..05195a1b 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm @@ -24,7 +24,7 @@ min_pq = 2 max_pq = null - cmode_music = 'sound/music/combat_weird.ogg' + cmode_music = 'sound/music/combatmusic/CombatDungeoneer.ogg' /datum/outfit/job/roguetown/dungeoneer/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm b/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm index 197258ab..799d859c 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm @@ -15,7 +15,7 @@ min_pq = 4 max_pq = null - cmode_music = 'sound/music/combat_guard2.ogg' + cmode_music = 'sound/music/combatmusic/CombatGatemaster.ogg' /datum/job/roguetown/gatemaster/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm index 983c5eba..04b8979b 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/manorguard.dm @@ -16,7 +16,7 @@ min_pq = 2 max_pq = null - cmode_music = 'sound/music/combat_guard2.ogg' + cmode_music = 'sound/music/combatmusic/CombatManorGuard.ogg' /datum/job/roguetown/manorguard/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm index c3a466a2..ef3ca008 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm @@ -22,7 +22,7 @@ min_pq = 4 max_pq = null - cmode_music = 'sound/music/combat_guard.ogg' + cmode_music = 'sound/music/combatmusic/CombatVeteran.ogg' /datum/job/roguetown/veteran/after_spawn(mob/living/L, mob/M, latejoin = TRUE) . = ..() diff --git a/code/modules/jobs/job_types/roguetown/nobility/hand.dm b/code/modules/jobs/job_types/roguetown/nobility/hand.dm index b5b8aff5..b7b54cd8 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/hand.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/hand.dm @@ -14,6 +14,7 @@ give_bank_account = 44 min_pq = 3 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatHand.ogg' /* /datum/job/roguetown/hand/special_job_check(mob/dead/new_player/player) diff --git a/code/modules/jobs/job_types/roguetown/nobility/knight.dm b/code/modules/jobs/job_types/roguetown/nobility/knight.dm index 7363a9ea..fe048eae 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/knight.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/knight.dm @@ -16,7 +16,7 @@ min_pq = 4 max_pq = null - cmode_music = 'sound/music/combat_guard2.ogg' + cmode_music = 'sound/music/combatmusic/CombatKnight.ogg' /datum/job/roguetown/knight/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm b/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm index ab2d7063..052cbb16 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/sheriff.dm @@ -21,7 +21,7 @@ min_pq = 4 max_pq = null - cmode_music = 'sound/music/combat_guard2.ogg' + cmode_music = 'sound/music/combatmusic/CombatSheriff.ogg' /datum/job/roguetown/sheriff/after_spawn(mob/living/L, mob/M, latejoin = TRUE) . = ..() diff --git a/code/modules/jobs/job_types/roguetown/nobility/steward.dm b/code/modules/jobs/job_types/roguetown/nobility/steward.dm index 49bb64a2..0f353c4b 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/steward.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/steward.dm @@ -18,6 +18,7 @@ give_bank_account = 17 min_pq = 2 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatButler.ogg' /datum/outfit/job/roguetown/steward/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/peasants/lunatic.dm b/code/modules/jobs/job_types/roguetown/peasants/lunatic.dm index 5e44c5a7..cc635865 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/lunatic.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/lunatic.dm @@ -24,7 +24,7 @@ tutorial = "The Lunatic, shunned by society and a magnet for misfortune. Your task is simple yet perilous: survive by any means, though your very existence invites danger from every corner. Seek redemption through kindness and camaraderie; it's your quickest escape from this cursed plight. Tread carefully, for trust is hard-won and easily lost." display_order = JDO_LUNATIC - cmode_music = 'sound/music/combat_bum.ogg' + cmode_music = 'sound/music/combatmusic/CombatLunatic.ogg' /datum/outfit/job/roguetown/lunatic/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm b/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm index 6fc8b6e0..1208349b 100644 --- a/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm +++ b/code/modules/jobs/job_types/roguetown/yeomen/merchant.dm @@ -22,7 +22,7 @@ max_pq = null required = TRUE - cmode_music = 'sound/music/combat_giza.ogg' + cmode_music = 'sound/music/combatmusic/CombatMerchant.ogg' /datum/outfit/job/roguetown/merchant/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm b/code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm index 7c9dda94..26f9fbab 100644 --- a/code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm +++ b/code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm @@ -27,7 +27,7 @@ min_pq = -30 max_pq = null - cmode_music = 'sound/music/combat_bum.ogg' + cmode_music = 'sound/music/combatmusic/CombatOrphan.ogg' /datum/job/roguetown/orphan/New() . = ..() diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/servant.dm b/code/modules/jobs/job_types/roguetown/youngfolk/servant.dm index 3de0a603..a7581b99 100644 --- a/code/modules/jobs/job_types/roguetown/youngfolk/servant.dm +++ b/code/modules/jobs/job_types/roguetown/youngfolk/servant.dm @@ -22,6 +22,7 @@ give_bank_account = TRUE min_pq = -10 max_pq = null + cmode_music = 'sound/music/combatmusic/CombatButler.ogg' /datum/outfit/job/roguetown/servant/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm b/code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm index 73ae9e8f..3024c6dc 100644 --- a/code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm +++ b/code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm @@ -27,7 +27,7 @@ min_pq = -10 max_pq = null - cmode_music = 'sound/music/combat_giza.ogg' + cmode_music = 'sound/music/combatmusic/CombatMerchant.ogg' /datum/outfit/job/roguetown/shophand/pre_equip(mob/living/carbon/human/H) ..() diff --git a/sound/music/combatmusic/CombatAcolyte.ogg b/sound/music/combatmusic/CombatAcolyte.ogg new file mode 100644 index 00000000..546aa8fc Binary files /dev/null and b/sound/music/combatmusic/CombatAcolyte.ogg differ diff --git a/sound/music/combatmusic/CombatButler.ogg b/sound/music/combatmusic/CombatButler.ogg new file mode 100644 index 00000000..cf81b0e4 Binary files /dev/null and b/sound/music/combatmusic/CombatButler.ogg differ diff --git a/sound/music/combatmusic/CombatCourtMage.ogg b/sound/music/combatmusic/CombatCourtMage.ogg new file mode 100644 index 00000000..1eaf0d30 Binary files /dev/null and b/sound/music/combatmusic/CombatCourtMage.ogg differ diff --git a/sound/music/combatmusic/CombatDungeoneer.ogg b/sound/music/combatmusic/CombatDungeoneer.ogg new file mode 100644 index 00000000..0bd09b7f Binary files /dev/null and b/sound/music/combatmusic/CombatDungeoneer.ogg differ diff --git a/sound/music/combatmusic/CombatGatemaster.ogg b/sound/music/combatmusic/CombatGatemaster.ogg new file mode 100644 index 00000000..55d932eb Binary files /dev/null and b/sound/music/combatmusic/CombatGatemaster.ogg differ diff --git a/sound/music/combatmusic/CombatHand.ogg b/sound/music/combatmusic/CombatHand.ogg new file mode 100644 index 00000000..473600a2 Binary files /dev/null and b/sound/music/combatmusic/CombatHand.ogg differ diff --git a/sound/music/combatmusic/CombatInquisitor.ogg b/sound/music/combatmusic/CombatInquisitor.ogg new file mode 100644 index 00000000..382f9d2a Binary files /dev/null and b/sound/music/combatmusic/CombatInquisitor.ogg differ diff --git a/sound/music/combatmusic/CombatJester1.ogg b/sound/music/combatmusic/CombatJester1.ogg new file mode 100644 index 00000000..2e630f66 Binary files /dev/null and b/sound/music/combatmusic/CombatJester1.ogg differ diff --git a/sound/music/combatmusic/CombatJester2.ogg b/sound/music/combatmusic/CombatJester2.ogg new file mode 100644 index 00000000..df1fb105 Binary files /dev/null and b/sound/music/combatmusic/CombatJester2.ogg differ diff --git a/sound/music/combatmusic/CombatJester3.ogg b/sound/music/combatmusic/CombatJester3.ogg new file mode 100644 index 00000000..02376249 Binary files /dev/null and b/sound/music/combatmusic/CombatJester3.ogg differ diff --git a/sound/music/combatmusic/CombatKnight.ogg b/sound/music/combatmusic/CombatKnight.ogg new file mode 100644 index 00000000..f92b852f Binary files /dev/null and b/sound/music/combatmusic/CombatKnight.ogg differ diff --git a/sound/music/combatmusic/CombatLunatic.ogg b/sound/music/combatmusic/CombatLunatic.ogg new file mode 100644 index 00000000..29f13748 Binary files /dev/null and b/sound/music/combatmusic/CombatLunatic.ogg differ diff --git a/sound/music/combatmusic/CombatManiac.ogg b/sound/music/combatmusic/CombatManiac.ogg new file mode 100644 index 00000000..af217807 Binary files /dev/null and b/sound/music/combatmusic/CombatManiac.ogg differ diff --git a/sound/music/combatmusic/CombatManorGuard.ogg b/sound/music/combatmusic/CombatManorGuard.ogg new file mode 100644 index 00000000..e4f30e9b Binary files /dev/null and b/sound/music/combatmusic/CombatManorGuard.ogg differ diff --git a/sound/music/combatmusic/CombatMerchant.ogg b/sound/music/combatmusic/CombatMerchant.ogg new file mode 100644 index 00000000..13d94cc8 Binary files /dev/null and b/sound/music/combatmusic/CombatMerchant.ogg differ diff --git a/sound/music/combatmusic/CombatMonk.ogg b/sound/music/combatmusic/CombatMonk.ogg new file mode 100644 index 00000000..8beb6964 Binary files /dev/null and b/sound/music/combatmusic/CombatMonk.ogg differ diff --git a/sound/music/combatmusic/CombatMortician.ogg b/sound/music/combatmusic/CombatMortician.ogg new file mode 100644 index 00000000..7c5fbc9d Binary files /dev/null and b/sound/music/combatmusic/CombatMortician.ogg differ diff --git a/sound/music/combatmusic/CombatOrphan.ogg b/sound/music/combatmusic/CombatOrphan.ogg new file mode 100644 index 00000000..1d20137a Binary files /dev/null and b/sound/music/combatmusic/CombatOrphan.ogg differ diff --git a/sound/music/combatmusic/CombatPriest.ogg b/sound/music/combatmusic/CombatPriest.ogg new file mode 100644 index 00000000..ee81dd0b Binary files /dev/null and b/sound/music/combatmusic/CombatPriest.ogg differ diff --git a/sound/music/combatmusic/CombatRanger.ogg b/sound/music/combatmusic/CombatRanger.ogg new file mode 100644 index 00000000..33b4b891 Binary files /dev/null and b/sound/music/combatmusic/CombatRanger.ogg differ diff --git a/sound/music/combatmusic/CombatRogue.ogg b/sound/music/combatmusic/CombatRogue.ogg new file mode 100644 index 00000000..65b31ce4 Binary files /dev/null and b/sound/music/combatmusic/CombatRogue.ogg differ diff --git a/sound/music/combatmusic/CombatSheriff.ogg b/sound/music/combatmusic/CombatSheriff.ogg new file mode 100644 index 00000000..4e798072 Binary files /dev/null and b/sound/music/combatmusic/CombatSheriff.ogg differ diff --git a/sound/music/combatmusic/CombatThief.ogg b/sound/music/combatmusic/CombatThief.ogg new file mode 100644 index 00000000..76f0bb3b Binary files /dev/null and b/sound/music/combatmusic/CombatThief.ogg differ diff --git a/sound/music/combatmusic/CombatVampireThrall.ogg b/sound/music/combatmusic/CombatVampireThrall.ogg new file mode 100644 index 00000000..b6df5ffe Binary files /dev/null and b/sound/music/combatmusic/CombatVampireThrall.ogg differ diff --git a/sound/music/combatmusic/CombatVeteran.ogg b/sound/music/combatmusic/CombatVeteran.ogg new file mode 100644 index 00000000..4e798072 Binary files /dev/null and b/sound/music/combatmusic/CombatVeteran.ogg differ diff --git a/sound/music/combatmusic/CombatWarrior.ogg b/sound/music/combatmusic/CombatWarrior.ogg new file mode 100644 index 00000000..df7ffb67 Binary files /dev/null and b/sound/music/combatmusic/CombatWarrior.ogg differ diff --git a/sound/music/combatmusic/CombatWitchHunter.ogg b/sound/music/combatmusic/CombatWitchHunter.ogg new file mode 100644 index 00000000..78174503 Binary files /dev/null and b/sound/music/combatmusic/CombatWitchHunter.ogg differ