Consort, RK, Hand, Adventurer bugfixes (#5744)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->

## About The Pull Request
This PR has been adjusted from original purpose. It is not simply
bugfixes for Hand, Consort, RK, and Adventurer. Keys should spawn more
reliably for triumph purchasers. Adventurers should no longer the the
double-torch bug. There is language in this PR about restricting triumph
purchases, but Kevin fixed that in another PR, so it is no longer needed
here.


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
A good deal of administrative overhead with the adv. class triumph buy
is fixed with this. Hand and RK key issues will no longer occur. RKs
WILL spawn with their weapon in their hand; they can fix this pretty
easily by just putting their keys in their belt.

<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Please note that
maintainers freely reserve the right to remove and add tags should they
deem it appropriate. You can attempt to finagle the system all you want,
but it's best to shoot for clear communication right off the bat. -->

<!-- !! Do not add whitespace in-between the entries, do not change the
tags and do not leave the tags without any entries. -->
:cl:
qol: Fixed RK sprite on the character selection screen
qol: Adventurers spawn with a lit torch, and not two torches
balance: Fixed RK stats and skills to be part of the adv class so they
don't double-dip on adv class triumph buy
fix: Moved Hand, RK keys to belt.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

## Pre-Merge Checklist
<!-- Don't bother filling these in while creating your Pull Request,
just click the checkboxes after the Pull Request is opened and you are
redirected to the page. -->
- [x] You tested this on a local server.
- [x] This code did not runtime during testing.
- [x] You documented all of your changes.
<!-- Neither the compiler nor workflow checks are perfect at detecting
runtimes and errors. It is important to test your code/feature/fix
locally. -->

Author: Telvayne

code/modules/jobs/job_types/adventurer/types/_advclass.dm

@@ -27,7 +27,7 @@
 		spawned.remove_status_effect(S)
 
 	if(spawn_with_torch)
-		spawned.put_in_hands(new /obj/item/flashlight/flare/torch)
+		spawned.put_in_hands(new /obj/item/flashlight/flare/torch/prelit)
 
 	apply_character_post_equipment(spawned)
 

code/modules/jobs/job_types/adventurer/types/combat/cleric.dm

@@ -166,7 +166,6 @@
 	neck = /obj/item/clothing/neck/chaincoif/iron
 	belt = /obj/item/storage/belt/leather/adventurer
 	backl = /obj/item/storage/backpack/satchel
-	r_hand = /obj/item/flashlight/flare/torch/prelit
 	cloak = /obj/item/clothing/cloak/tabard/crusader
 	wrists = /obj/item/clothing/neck/psycross/silver
 	backpack_contents = list(/obj/item/storage/belt/pouch/coins/poor = 1, /obj/item/reagent_containers/food/snacks/hardtack = 1)

code/modules/jobs/job_types/adventurer/types/combat/warrior.dm

@@ -51,7 +51,6 @@
 /datum/outfit/adventurer/sfighter
 	name = "Fighter (Adventurer)"
 	belt = /obj/item/storage/belt/leather/adventurer // new belt
-	r_hand = /obj/item/flashlight/flare/torch/prelit // they get back their missing torches
 	shirt = /obj/item/clothing/armor/gambeson
 	wrists = /obj/item/clothing/wrists/bracers/leather
 	pants = /obj/item/clothing/pants/trou/leather

code/modules/jobs/job_types/garrison/royal_knight.dm

@@ -1,28 +1,3 @@
-/datum/attribute_holder/sheet/job/royalknight
-	raw_attribute_list = list(
-		STAT_STRENGTH = 3,
-		STAT_PERCEPTION = 2,
-		STAT_ENDURANCE = 2,
-		STAT_CONSTITUTION = 2,
-		STAT_INTELLIGENCE = 1,
-		/datum/attribute/skill/combat/swords = 40,
-		/datum/attribute/skill/combat/wrestling = 40,
-		/datum/attribute/skill/combat/unarmed = 30,
-		/datum/attribute/skill/combat/shields = 30,
-		/datum/attribute/skill/combat/polearms = 30,
-		/datum/attribute/skill/combat/whipsflails = 30,
-		/datum/attribute/skill/combat/axesmaces = 30,
-		/datum/attribute/skill/combat/knives = 20,
-		/datum/attribute/skill/combat/bows = 30,
-		/datum/attribute/skill/combat/crossbows = 40,
-		/datum/attribute/skill/misc/athletics = 40,
-		/datum/attribute/skill/misc/riding = 30,
-		/datum/attribute/skill/misc/swimming = 20,
-		/datum/attribute/skill/misc/climbing = 20,
-		/datum/attribute/skill/misc/reading = 10,
-		/datum/attribute/skill/labor/mathematics = 30
-	)
-
 /datum/job/royalknight
 	title = "Royal Knight"
 	tutorial = "You are a knight of the royal family, elevated by your skill and steadfast devotion. \
@@ -33,6 +8,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
@@ -54,7 +30,6 @@
 		EXP_TYPE_COMBAT = 1200
 	)
 
-	attribute_sheet = /datum/attribute_holder/sheet/job/royalknight
 	honorary = "Sir"
 	honorary_f = "Dame"
 
@@ -142,21 +117,47 @@
 	pants = /obj/item/clothing/pants/platelegs
 	cloak = /obj/item/clothing/cloak/tabard/knight/guard
 	shirt = /obj/item/clothing/armor/gambeson/arming
+	wrists = /obj/item/storage/keyring/manorguard
 	belt = /obj/item/storage/belt/leather
 	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)
 
 /datum/outfit/royalknight/post_equip(mob/living/carbon/human/H, visuals_only = FALSE)
 	. = ..()
 	if(H.cloak && !findtext(H.cloak.name, "([H.real_name])"))
 		H.cloak.name = "[H.cloak.name] ([H.real_name])"
 
+/datum/attribute_holder/sheet/job/royalknight/knight
+	raw_attribute_list = list(
+		STAT_STRENGTH = 3,
+		STAT_PERCEPTION = 2,
+		STAT_ENDURANCE = 2,
+		STAT_CONSTITUTION = 2,
+		STAT_INTELLIGENCE = 1,
+		/datum/attribute/skill/combat/swords = 40,
+		/datum/attribute/skill/combat/wrestling = 40,
+		/datum/attribute/skill/combat/unarmed = 30,
+		/datum/attribute/skill/combat/shields = 30,
+		/datum/attribute/skill/combat/polearms = 30,
+		/datum/attribute/skill/combat/whipsflails = 30,
+		/datum/attribute/skill/combat/axesmaces = 30,
+		/datum/attribute/skill/combat/knives = 20,
+		/datum/attribute/skill/combat/bows = 30,
+		/datum/attribute/skill/combat/crossbows = 40,
+		/datum/attribute/skill/misc/athletics = 40,
+		/datum/attribute/skill/misc/riding = 30,
+		/datum/attribute/skill/misc/swimming = 20,
+		/datum/attribute/skill/misc/climbing = 20,
+		/datum/attribute/skill/misc/reading = 10,
+		/datum/attribute/skill/labor/mathematics = 30
+)
+
 /datum/job/advclass/royalknight/knight
 	title = "Royal Knight"
 	tutorial = "The classic Knight in shining armor. Slightly more skilled then their Steam counterpart but has worse armor."
 	outfit = /datum/outfit/royalknight/knight
+	attribute_sheet = /datum/attribute_holder/sheet/job/royalknight/knight
 	category_tags = list(CTAG_ROYALKNIGHT)
 
 /datum/outfit/royalknight/knight
@@ -183,16 +184,28 @@
 
 /datum/attribute_holder/sheet/job/royalknight/steam
 	raw_attribute_list = list(
-		/datum/attribute/skill/combat/swords = -10,
-		/datum/attribute/skill/combat/unarmed = -10,
-		/datum/attribute/skill/combat/shields = -10,
-		/datum/attribute/skill/combat/wrestling = -10,
-		/datum/attribute/skill/combat/polearms = -10,
-		/datum/attribute/skill/combat/whipsflails = -10,
-		/datum/attribute/skill/combat/axesmaces = -10,
-		/datum/attribute/skill/combat/bows = -10,
-		/datum/attribute/skill/combat/crossbows = -10,
-		/datum/attribute/skill/craft/engineering = 30
+		STAT_STRENGTH = 3,
+		STAT_PERCEPTION = 2,
+		STAT_ENDURANCE = 2,
+		STAT_CONSTITUTION = 2,
+		STAT_INTELLIGENCE = 1,
+		/datum/attribute/skill/combat/swords = 30,
+		/datum/attribute/skill/combat/wrestling = 30,
+		/datum/attribute/skill/combat/unarmed = 20,
+		/datum/attribute/skill/combat/shields = 20,
+		/datum/attribute/skill/combat/polearms = 20,
+		/datum/attribute/skill/combat/whipsflails = 20,
+		/datum/attribute/skill/combat/axesmaces = 20,
+		/datum/attribute/skill/combat/knives = 20,
+		/datum/attribute/skill/combat/bows = 20,
+		/datum/attribute/skill/combat/crossbows = 30,
+		/datum/attribute/skill/misc/athletics = 40,
+		/datum/attribute/skill/misc/riding = 30,
+		/datum/attribute/skill/misc/swimming = 20,
+		/datum/attribute/skill/misc/climbing = 20,
+		/datum/attribute/skill/misc/reading = 10,
+		/datum/attribute/skill/labor/mathematics = 30,
+		/datum/attribute/skill/craft/engineering = 30,
 	)
 
 /datum/job/advclass/royalknight/steam

code/modules/jobs/job_types/nobility/hand.dm

@@ -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)
 	. = ..()
@@ -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
 
@@ -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)
@@ -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)