Skip to content

New Minor Noble subclasses #6443

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

Open
DarthGP wants to merge 6 commits into
base: main
Choose a base branch
from
+214 −17
Open

New Minor Noble subclasses #6443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0ddad6
Update minor_noble.dm
DarthGP May 11, 2026
ea37a20
Add CTAG_MINOR_NOBLE definition for Minor Noble classes
DarthGP May 11, 2026
24b49c3
Merge branch 'main' into main
DarthGP May 12, 2026
c5a87be
New Herald subclass + baronet title for Former Commander
DarthGP May 12, 2026
c26b57b
Should display 'Noble' when examined and not subclass + attributes fi…
DarthGP May 17, 2026
fc67fa5
Merge branch 'main' into main
DarthGP May 20, 2026
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
1 change: 1 addition & 0 deletions code/__DEFINES/roguetown.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ GLOBAL_LIST_EMPTY(job_respawn_delays)
#define CTAG_MAGIE "CAT_MAGIE" //for Mage Associate
#define CTAG_HEIR "CAT_HEIR"
#define CTAG_HAND "CAT_HAND" // Hand class - Handles Hand class selector
#define CTAG_MINOR_NOBLE "CAT_MINOR_NOBLE" // Minor Noble classes
#define CTAG_CONSORT "CAT_CONSORT" // Consort classes
#define CTAG_VETERAN "CAT_VETERAN" // Veteran class - Handles Veteran class selector
#define CTAG_TOWN_ELDER "CAT_TOWN_ELDER" // Town Elder class - Handles Town Elder class selector
Expand Down
230 changes: 213 additions & 17 deletions code/modules/jobs/job_types/nobility/minor_noble.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,16 @@
bypass_lastclass = TRUE
allowed_races = RACES_PLAYER_NONDISCRIMINATED
outfit = /datum/outfit/noble
advclass_cat_rolls = list(CTAG_MINOR_NOBLE = 20)
apprentice_name = JOB_SERVANT
give_bank_account = 60
noble_income = 16
cmode_music = 'sound/music/cmode/nobility/combat_noble.ogg'
allowed_ages = ALL_AGES_LIST_CHILD
spells = list(/datum/action/cooldown/spell/undirected/call_bird)
job_bitflag = BITFLAG_ROYALTY

honorary = "Lord"
honorary_f = "Lady"

/datum/job/advclass/minornoble
inherit_parent_title = TRUE
exp_types_granted = list(EXP_TYPE_NOBLE)

attribute_sheet = /datum/attribute_holder/sheet/job/minor_noble
Expand All @@ -61,18 +60,222 @@
TRAIT_NOBLE_POWER
)

/datum/attribute_holder/sheet/job/former_commander
raw_attribute_list = list(
STAT_STRENGTH = 2,
STAT_INTELLIGENCE = -1,
STAT_CONSTITUTION = 1,
STAT_ENDURANCE = 1,
STAT_SPEED = 1,
/datum/attribute/skill/combat/swords = 10,
/datum/attribute/skill/misc/riding = 30,
/datum/attribute/skill/misc/athletics = 10,
/datum/attribute/skill/misc/reading = 20,
/datum/attribute/skill/misc/sneaking = 20,
/datum/attribute/skill/misc/athletics = 30,
/datum/attribute/skill/combat/unarmed = 10,
/datum/attribute/skill/combat/wrestling = 20,
/datum/attribute/skill/labor/mathematics = 30,
/datum/attribute/skill/combat/bows = 20
)

/datum/job/advclass/minornoble/former_commander
title = "Former Commander"
tutorial = "Through merit or inheritance, you once served as a lieutenant in the Royal army, leading your forces to victory. Though your military daes are behind you, and your skills rusty, you still keep your old armour and arrogance."
outfit = /datum/outfit/minornoble/former_commander
category_tags = list(CTAG_MINOR_NOBLE)
allowed_ages = list(AGE_MIDDLEAGED, AGE_OLD, AGE_IMMORTAL)
give_bank_account = 40
honorary = "Baronet"
honorary_f = "Baronetess"

attribute_sheet = /datum/attribute_holder/sheet/job/former_commander

traits = list(
TRAIT_MEDIUMARMOR,
TRAIT_HEAVYARMOR,
)


/datum/outfit/minornoble/former_commander
name = "Former Commander (noble)"
head = /obj/item/clothing/head/helmet/heavy/decorated/bascinet
cloak = /obj/item/clothing/cloak/cape
shirt = /obj/item/clothing/armor/gambeson/arming
armor = /obj/item/clothing/armor/cuirass/fluted
gloves = /obj/item/clothing/gloves/plate
backr = /obj/item/storage/backpack/satchel

/datum/attribute_holder/sheet/job/magnate
raw_attribute_list = list(
STAT_STRENGTH = -3,
STAT_INTELLIGENCE = 3,
STAT_CONSTITUTION = -2,
STAT_ENDURANCE = 1,
STAT_SPEED = -3,
/datum/attribute/skill/labor/mathematics = 60,
/datum/attribute/skill/misc/reading = 30,
/datum/attribute/skill/misc/riding = 20,
/datum/attribute/skill/misc/athletics = 10,
/datum/attribute/skill/combat/bows = 20
)

/datum/job/advclass/minornoble/magnate
title = "Magnate"
tutorial = "Through years of careful investment or plain old nepotism, you have managed to gather a large fortune. You have not had much in the way of physical exercise, however, so it would be wise to put your wealth to use in this regard."
outfit = /datum/outfit/minornoble/magnate
category_tags = list(CTAG_MINOR_NOBLE)
give_bank_account = 300
honorary = "Lord"
honorary_f = "Lady"

attribute_sheet = /datum/attribute_holder/sheet/job/magnate

traits = list(
TRAIT_SEEPRICES,
TRAIT_FAT,
)


/datum/outfit/minornoble/magnate
name = "Magnate (noble)"
shirt = /obj/item/clothing/shirt/undershirt/formal
cloak = /obj/item/clothing/cloak/raincloak/furcloak
armor = /obj/item/clothing/armor/leather/jacket/tailcoat/lord
backr = /obj/item/storage/backpack/satchel
head = /obj/item/clothing/head/chaperon/colored/greyscale/silk
mask = /obj/item/clothing/face/spectacles/monocle

/datum/attribute_holder/sheet/job/magickal_graduate
raw_attribute_list = list(
STAT_STRENGTH = -2,
STAT_INTELLIGENCE = 3,
STAT_ENDURANCE = -1,
STAT_SPEED = -1,
/datum/attribute/skill/magic/arcane = 25,
/datum/attribute/skill/misc/reading = 30,
/datum/attribute/skill/misc/riding = 20,
/datum/attribute/skill/misc/sneaking = 25,
/datum/attribute/skill/misc/athletics = 25,
/datum/attribute/skill/combat/unarmed = 10,
/datum/attribute/skill/combat/wrestling = 10,
/datum/attribute/skill/labor/mathematics = 30,
/datum/attribute/skill/combat/bows = 20
)

/datum/job/advclass/minornoble/magickal_graduate
title = "Magickal Graduate"
tutorial = "You've spent a large portion of your inheritance on magickal tuition in Kingsfield, though you spent much of that time drinking. As a consequence, you only took in a basic education though that still sets you above the rest of the uneducated masses."
outfit = /datum/outfit/minornoble/magickal_graduate
category_tags = list(CTAG_MINOR_NOBLE)
give_bank_account = 20
honorary = "Lord"
honorary_f = "Lady"

attribute_sheet = /datum/attribute_holder/sheet/job/magickal_graduate

/datum/outfit/minornoble/magickal_graduate
name = "Magical Graduate (noble)"
head = /obj/item/clothing/head/wizhat/gen
shirt = /obj/item/clothing/shirt/tunic/colored/random
armor = /obj/item/clothing/armor/basiceast/crafteast
cloak = /obj/item/clothing/cloak/raincloak/furcloak
backr = /obj/item/storage/backpack/satchel/black
backpack_contents = list(
/obj/item/book/granter/spellbook/apprentice = 1,
/obj/item/chalk = 1
)

/datum/attribute_holder/sheet/job/herald
raw_attribute_list = list(
STAT_STRENGTH = -2,
STAT_INTELLIGENCE = 3,
STAT_SPEED = 2,
/datum/attribute/skill/misc/music = 25,
/datum/attribute/skill/misc/reading = 40,
/datum/attribute/skill/misc/riding = 30,
/datum/attribute/skill/misc/reading = 20,
/datum/attribute/skill/misc/sneaking = 20,
/datum/attribute/skill/misc/athletics = 20,
/datum/attribute/skill/combat/unarmed = 10,
/datum/attribute/skill/combat/wrestling = 10,
/datum/attribute/skill/labor/mathematics = 30,
/datum/attribute/skill/combat/bows = 20
)

/datum/job/advclass/minornoble/herald
title = "Lord Herald"
tutorial = "Through an aptitude for words, or politicking, you’ve managed to become the Sovereign’s loyal herald. Make sure their word is known by the commoners, and act as their mouthpiece, for surely they still have use for you despite their throne…"
outfit = /datum/outfit/minornoble/herald
category_tags = list(CTAG_MINOR_NOBLE)
give_bank_account = 60
honorary = "Lord Herald"
honorary_f = "Lady Herald"

attribute_sheet = /datum/attribute_holder/sheet/job/herald

traits = list(
TRAIT_BARDIC_TRAINING
)

/datum/outfit/minornoble/herald
name = "Lord Herald (noble)"
head = /obj/item/clothing/head/chaperon
cloak = /obj/item/clothing/cloak/raincloak/furcloak
shirt = /obj/item/clothing/shirt/dress/silkdress/loudmouth
backr = /obj/item/storage/backpack/satchel

/datum/attribute_holder/sheet/job/vassal
raw_attribute_list = list(
STAT_INTELLIGENCE = 1,
/datum/attribute/skill/misc/reading = 20,
/datum/attribute/skill/misc/riding = 20,
/datum/attribute/skill/misc/sneaking = 20,
/datum/attribute/skill/misc/athletics = 20,
/datum/attribute/skill/combat/unarmed = 10,
/datum/attribute/skill/combat/wrestling = 10,
/datum/attribute/skill/labor/mathematics = 30,
/datum/attribute/skill/combat/bows = 20
)

/datum/job/advclass/minornoble/vassal
title = "Vassal"
tutorial = "A jack of all trades, in a field with no masters. You are the very ideal of a nobleman, not excelling in any area except your ego. Perhaps your mediocrity will inspire an ambition to push yourself above your peers, or just keep you sitting on your estate."
outfit = /datum/outfit/minornoble/vassal
category_tags = list(CTAG_MINOR_NOBLE)
give_bank_account = 100
honorary = "Lord"
honorary_f = "Lady"

attribute_sheet = /datum/attribute_holder/sheet/job/vassal


/datum/outfit/minornoble/vassal
name = "Vassal (noble)"
shoes = /obj/item/clothing/shoes/boots
shirt = /obj/item/clothing/shirt/tunic/colored/random
backl = /obj/item/storage/backpack/satchel
neck = /obj/item/storage/belt/pouch/coins/veryrich
belt = /obj/item/storage/belt/leather
ring = /obj/item/clothing/ring/silver
cloak = /obj/item/clothing/cloak/raincloak/furcloak
backr = /obj/item/gun/ballistic/bow
beltl = /obj/item/ammo_holder/quiver/arrows
head = /obj/item/clothing/head/fancyhat
backl = /obj/item/storage/backpack/satchel

/datum/job/minor_noble/after_spawn(mob/living/carbon/human/spawned, client/player_client)
. = ..()
if(istype(spawned.patron, /datum/patron/inhumen/baotha))
spawned.cmode_music = 'sound/music/cmode/antag/CombatBaotha.ogg'

/datum/job/minor_noble/on_roundstart(mob/living/carbon/human/spawned, client/player_client)
. = ..()
var/static/list/selectable = list( \
"Dagger" = /obj/item/weapon/knife/dagger/silver, \
"Rapier" = /obj/item/weapon/sword/rapier/dec, \
"Cane Blade" = /obj/item/weapon/sword/rapier/caneblade, \
)
var/static/list/selectable = list(
"Dagger" = /obj/item/weapon/knife/dagger/silver,
"Rapier" = /obj/item/weapon/sword/rapier/dec,
"Cane Blade" = /obj/item/weapon/sword/rapier/caneblade,
)
var/choice = spawned.select_equippable(player_client, selectable, time_limit = 1 MINUTES, message = "Choose your weapon", title = JOB_MINOR_NOBLE)
if(!choice)
return
Expand All @@ -94,23 +297,16 @@
qdel(scabbard)

/datum/outfit/noble
name = "Noble"
name = "Noble Base"
shoes = /obj/item/clothing/shoes/boots
shirt = /obj/item/clothing/shirt/dress/silkdress/colored/random
backl = /obj/item/storage/backpack/satchel
neck = /obj/item/storage/belt/pouch/coins/veryrich
belt = /obj/item/storage/belt/leather
ring = /obj/item/clothing/ring/silver
cloak = /obj/item/clothing/cloak/raincloak/furcloak
backr = /obj/item/gun/ballistic/bow
beltl = /obj/item/ammo_holder/quiver/arrows
head = /obj/item/clothing/head/fancyhat

/datum/outfit/noble/pre_equip(mob/living/carbon/human/equipped_human, visuals_only)
. = ..()
if(equipped_human.gender == MALE)
pants = /obj/item/clothing/pants/tights/colored/black
shirt = /obj/item/clothing/shirt/tunic/colored/random
if(equipped_human.age == AGE_CHILD)
backpack_contents = list(
/obj/item/reagent_containers/glass/carafe/teapot/tea = 1,
Expand Down
Loading