Skip to content

Consort, RK, Hand, Adventurer bugfixes #5744

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

Merged
KevinfromHP merged 5 commits into from
Mar 25, 2026
Merged

Consort, RK, Hand, Adventurer bugfixes #5744

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
435fbce
Did it all in one sitting
Telvayne Mar 20, 2026
1a59ec4
More bug fixes + reverted triumph-specific changes
Telvayne Mar 21, 2026
bd92d92
Merge branch 'main' into rk-hand-consort-fixes-and-triumph-buy-restri…
Telvayne Mar 21, 2026
ea2c6e4
Moved RK keys to wrist
Telvayne Mar 22, 2026
5a20287
Merge remote-tracking branch 'upstream/main' into rk-hand-consort-fix…
Telvayne Mar 22, 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
6 changes: 6 additions & 0 deletions code/controllers/subsystem/triumph/buy_datums/character/pick_any_class.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,12 @@
continue
if(CTAG_ARCHIVIST in CHECKS.category_tags)
continue
if(CTAG_CONSORT in CHECKS.category_tags)
continue
if(CTAG_ROYALKNIGHT in CHECKS.category_tags)
continue
if(CTAG_HAND in CHECKS.category_tags)
continue
possible_classes += CHECKS

var/list/class_titles = list()
Expand Down
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/garrison/royal_knight.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
job_flags = (JOB_ANNOUNCE_ARRIVAL | JOB_SHOW_IN_CREDITS | JOB_EQUIP_RANK | JOB_NEW_PLAYER_JOINABLE)
display_order = JDO_ROYALKNIGHT
faction = FACTION_TOWN
outfit = /datum/outfit/royalknight
total_positions = 2
spawn_positions = 2
bypass_lastclass = TRUE
Expand Down Expand Up @@ -146,7 +147,7 @@
beltr = /obj/item/weapon/sword/arming
backl = /obj/item/storage/backpack/satchel
scabbards = list(/obj/item/weapon/scabbard/sword/noble)
backpack_contents = list(/obj/item/storage/keyring/manorguard = 1)
beltl = /obj/item/storage/keyring/manorguard

/datum/outfit/royalknight/post_equip(mob/living/carbon/human/H, visuals_only = FALSE)
. = ..()
Expand Down
20 changes: 8 additions & 12 deletions code/modules/jobs/job_types/nobility/hand.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,11 @@
TRAIT_NOBLE_POWER
)

/*/datum/outfit/hand
/datum/outfit/hand
name = "Hand"
shoes = /obj/item/clothing/shoes/nobleboot/thighboots
belt = /obj/item/storage/belt/leather/steel*/
belt = /obj/item/storage/belt/leather/black
beltr = /obj/item/storage/keyring/hand


/datum/job/hand/after_spawn(mob/living/carbon/human/spawned, client/player_client)
. = ..()
Expand Down Expand Up @@ -108,13 +109,12 @@
backr = /obj/item/storage/backpack/satchel/black
backpack_contents = list(
/obj/item/weapon/knife/dagger/steel = 1,
/obj/item/storage/keyring/hand = 1,
/obj/item/paper/scroll/frumentarii/roundstart = 1
)
armor = /obj/item/clothing/armor/leather/jacket/handjacket
pants = /obj/item/clothing/pants/tights/colored/black
belt = /obj/item/storage/belt/leather/steel
beltr = /obj/item/weapon/sword/rapier/dec
beltl = /obj/item/weapon/sword/rapier/dec
scabbards = list(/obj/item/weapon/scabbard/sword/royal)
shoes = /obj/item/clothing/shoes/nobleboot/thighboots

Expand Down Expand Up @@ -167,14 +167,12 @@
pants = /obj/item/clothing/pants/trou/shadowpants
backr = /obj/item/storage/backpack/satchel/black
wrists = /obj/item/clothing/wrists/bracers/leather/scabbard
belt = /obj/item/storage/belt/leather/black
beltl = /obj/item/weapon/knife/dagger/steel/hand
beltr = /obj/item/weapon/knife/dagger/steel/hand/parry
beltl = /obj/item/weapon/knife/dagger/steel/hand/parry
shoes = /obj/item/clothing/shoes/boots
backpack_contents = list(
/obj/item/storage/keyring/hand = 1,
/obj/item/lockpickring/mundane = 1,
/obj/item/paper/scroll/frumentarii/roundstart = 1
/obj/item/paper/scroll/frumentarii/roundstart = 1,
/obj/item/weapon/knife/dagger/steel/hand = 1,
)

/datum/outfit/hand/spymaster/pre_equip(mob/living/carbon/human/equipped_human, visuals_only)
Expand Down Expand Up @@ -246,13 +244,11 @@
backr = /obj/item/storage/backpack/satchel/black
backpack_contents = list(
/obj/item/weapon/knife/dagger/steel = 1,
/obj/item/storage/keyring/hand = 1,
/obj/item/reagent_containers/glass/bottle/poison = 1,
/obj/item/paper/scroll/frumentarii/roundstart = 1
)
armor = /obj/item/clothing/armor/gambeson/hand
pants = /obj/item/clothing/pants/tights/colored/black
shoes = /obj/item/clothing/shoes/boots
belt = /obj/item/storage/belt/leather/black
beltl = /obj/item/weapon/sword/rapier/caneblade/hand
scabbards = list(/obj/item/weapon/scabbard/cane/hand)
Loading