From 1975df0ef6f40c12b303097d8dc3c186e29363d9 Mon Sep 17 00:00:00 2001 From: Greenjoe12345 Date: Fri, 19 Jul 2024 02:35:11 +0100 Subject: [PATCH 1/2] knight --- maps/shaded_hills/jobs/visitors.dm | 6 +++++- maps/shaded_hills/outfits/visitors.dm | 13 ++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/maps/shaded_hills/jobs/visitors.dm b/maps/shaded_hills/jobs/visitors.dm index 26c29e7f390..9b9ae1137ad 100644 --- a/maps/shaded_hills/jobs/visitors.dm +++ b/maps/shaded_hills/jobs/visitors.dm @@ -42,12 +42,16 @@ name = "Itinerant Scholar" /datum/job/shaded_hills/visitor/beggar_knight - title = "Beggar Knight" + title = "Beggar Knight, Shortsword and Shield" supervisors = "your vows" description = "You are a wandering swordmaster sworn to a vow of poverty, with nothing to your name but the armour on your back and the blade at your hip. Beggar knights are tolerated due to their martial prowess, and are usually paid with food or new equipment as they are avowed against carrying coin." spawn_positions = 2 total_positions = 2 + economic_power = 0 //vowed against carrying money outfit_type = /decl/hierarchy/outfit/job/shaded_hills/beggar_knight + alt_titles = list( + "Beggar Knight, Longsword" = /decl/hierarchy/outfit/job/shaded_hills/beggar_knight/longsword, + ) min_skill = list( SKILL_WEAPONS = SKILL_ADEPT, SKILL_ATHLETICS = SKILL_ADEPT, diff --git a/maps/shaded_hills/outfits/visitors.dm b/maps/shaded_hills/outfits/visitors.dm index b9930f5dc86..8bb68036709 100644 --- a/maps/shaded_hills/outfits/visitors.dm +++ b/maps/shaded_hills/outfits/visitors.dm @@ -2,9 +2,20 @@ name = "Shaded Hills - Traveller" /decl/hierarchy/outfit/job/shaded_hills/beggar_knight - name = "Shaded Hills - Beggar Knight" + name = "Shaded Hills - Beggar Knight, Shortsword and Shield" suit = /obj/item/clothing/suit/armor/forged/banded belt = /obj/item/bladed/shortsword + hands = list(/obj/item/shield/buckler) + backpack_contents = list( + /obj/item/stack/medical/bruise_pack/bandage/five = 1, + /obj/item/stack/medical/ointment/poultice/five = 1, + /obj/item/chems/waterskin/crafted/wine = 1 + ) + +/decl/hierarchy/outfit/job/shaded_hills/beggar_knight/longsword + name = "Shaded Hills - Beggar Knight, Longsword" + suit = /obj/item/clothing/suit/armor/forged/banded + belt = /obj/item/bladed/longsword backpack_contents = list( /obj/item/stack/medical/bruise_pack/bandage/five = 1, /obj/item/stack/medical/ointment/poultice/five = 1, From 5e329f08e2abdfcc33baf882bdf2d136b179c17b Mon Sep 17 00:00:00 2001 From: Greenjoe12345 Date: Fri, 19 Jul 2024 02:56:44 +0100 Subject: [PATCH 2/2] fix --- maps/shaded_hills/outfits/visitors.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/maps/shaded_hills/outfits/visitors.dm b/maps/shaded_hills/outfits/visitors.dm index 8bb68036709..7477968d856 100644 --- a/maps/shaded_hills/outfits/visitors.dm +++ b/maps/shaded_hills/outfits/visitors.dm @@ -16,6 +16,7 @@ name = "Shaded Hills - Beggar Knight, Longsword" suit = /obj/item/clothing/suit/armor/forged/banded belt = /obj/item/bladed/longsword + hands = list() backpack_contents = list( /obj/item/stack/medical/bruise_pack/bandage/five = 1, /obj/item/stack/medical/ointment/poultice/five = 1,