Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Additions and Changes to Combat Tracks. #53

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Additions and Changes to Combat Tracks. #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/antagonists/roguetown/villain/maniac/maniac.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/roguetown/villain/vampire.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/monk.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/mortician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/priest.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/church/puritan.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/courtier/butler.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
9 changes: 8 additions & 1 deletion code/modules/jobs/job_types/roguetown/courtier/jester.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/courtier/magician.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/garrison/gatemaster.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/garrison/manorguard.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/garrison/veteran.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/nobility/hand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/nobility/knight.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/nobility/sheriff.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/nobility/steward.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/peasants/lunatic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/yeomen/merchant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/youngfolk/orphan.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
. = ..()
Expand Down
1 change: 1 addition & 0 deletions code/modules/jobs/job_types/roguetown/youngfolk/servant.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/roguetown/youngfolk/shophand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
..()
Expand Down
Binary file added sound/music/combatmusic/CombatAcolyte.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatButler.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatCourtMage.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatDungeoneer.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatGatemaster.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatHand.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatInquisitor.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatJester1.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatJester2.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatJester3.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatKnight.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatLunatic.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatManiac.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatManorGuard.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatMerchant.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatMonk.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatMortician.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatOrphan.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatPriest.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatRanger.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatRogue.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatSheriff.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatThief.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatVampireThrall.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatVeteran.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatWarrior.ogg
View file
Open in desktop
Binary file not shown.
Binary file added sound/music/combatmusic/CombatWitchHunter.ogg
View file
Open in desktop
Binary file not shown.