From ab5dda6b648900458077a9fe3d38b7ebdeb55b92 Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Sun, 14 Apr 2024 10:37:58 -0700 Subject: [PATCH 1/5] Update roguetown.dme --- roguetown.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/roguetown.dme b/roguetown.dme index 8e778a8246..f699df5b07 100644 --- a/roguetown.dme +++ b/roguetown.dme @@ -2099,6 +2099,7 @@ #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\rogue.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\sorceress.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\warrior.dm" +#include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\donator\dwarfwarrior.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\donator\grenzelhoft.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\donator\templar.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\donator\vaquero.dm" From 97cde0166cecceef66711c9bff67f0fb975ee0cf Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Sun, 14 Apr 2024 10:38:38 -0700 Subject: [PATCH 2/5] Add files via upload --- .../types/combat/donator/dwarfwarrior.dm | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm new file mode 100644 index 0000000000..4d9c7f0c0e --- /dev/null +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm @@ -0,0 +1,41 @@ + +/datum/advclass/dwarfwarrior + name = "Dwarf Warrior" + tutorial = "Dwarf Warriors are the bread and butter of their miliary sworn to defend their mountain fortress. Armed with either a battle axe or mace, they are a force to be reckoned with." + allowed_sexes = list("male", "female") + allowed_races = list("Dwarf","Dwarf") + outfit = /datum/outfit/job/roguetown/adventurer/dwarfwarrior + maxchosen = 2 + +/datum/outfit/job/roguetown/adventurer/dwarfwarrior/pre_equip(mob/living/carbon/human/H) + ..() + head = /obj/item/clothing/head/roguetown/helmet/winged + pants = /obj/item/clothing/under/roguetown/trou + shoes = /obj/item/clothing/shoes/roguetown/boots/leather + belt = /obj/item/storage/belt/rogue/leather + armor = /obj/item/clothing/suit/roguetown/armor/chainmail/iron + wrists = /obj/item/clothing/wrists/roguetown/bracers/leather + backr = /obj/item/rogueweapon/shield/wood + if(prob(25)) + mask = /obj/item/clothing/mask/rogue/facemask + if(prob(25)) + gloves = /obj/item/clothing/gloves/roguetown/chain + else + gloves = /obj/item/clothing/gloves/roguetown/angle + if(prob(50)) + beltl = /obj/item/rogueweapon/mace/steel + else + beltl = /obj/item/rogueweapon/stoneaxe/battle + + H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.change_stat("constitution", 2) + H.change_stat("speed", -1) + H.change_stat("strength", 2) + H.change_stat("endurance", 2) + ADD_TRAIT(H, RTRAIT_HEAVYARMOR, TRAIT_GENERIC) \ No newline at end of file From 688317ab932c044c2bdeb820c6b422dd04004ede Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Sun, 14 Apr 2024 11:06:33 -0700 Subject: [PATCH 3/5] Update dwarfwarrior.dm --- .../roguetown/adventurer/types/combat/donator/dwarfwarrior.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm index 4d9c7f0c0e..5b45bc0236 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm @@ -1,6 +1,6 @@ /datum/advclass/dwarfwarrior - name = "Dwarf Warrior" + name = "Warrior" tutorial = "Dwarf Warriors are the bread and butter of their miliary sworn to defend their mountain fortress. Armed with either a battle axe or mace, they are a force to be reckoned with." allowed_sexes = list("male", "female") allowed_races = list("Dwarf","Dwarf") @@ -38,4 +38,4 @@ H.change_stat("speed", -1) H.change_stat("strength", 2) H.change_stat("endurance", 2) - ADD_TRAIT(H, RTRAIT_HEAVYARMOR, TRAIT_GENERIC) \ No newline at end of file + ADD_TRAIT(H, RTRAIT_HEAVYARMOR, TRAIT_GENERIC) From eb51efbebbeb034150ee71676ab9f46229eeafbf Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:58:35 -0700 Subject: [PATCH 4/5] Update dwarfwarrior.dm --- .../roguetown/adventurer/types/combat/donator/dwarfwarrior.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm index 5b45bc0236..27c483774a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm @@ -1,6 +1,6 @@ /datum/advclass/dwarfwarrior - name = "Warrior" + name = "Cavern Warrior" tutorial = "Dwarf Warriors are the bread and butter of their miliary sworn to defend their mountain fortress. Armed with either a battle axe or mace, they are a force to be reckoned with." allowed_sexes = list("male", "female") allowed_races = list("Dwarf","Dwarf") From 78a16e1ad3f48780d93c9d10c05d0e4ff6177ddb Mon Sep 17 00:00:00 2001 From: Osmos123 <126647931+Osmos123@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:59:45 -0700 Subject: [PATCH 5/5] Update dbomb.dm --- .../jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm index 582110dc85..0d191e7a4a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm @@ -1,5 +1,5 @@ /datum/advclass/dbomb - name = "Dwarf" + name = "Vagrant" tutorial = "Dwarves like to blow things up." allowed_sexes = list("male", "female") allowed_races = list("Dwarf","Dwarf") @@ -33,4 +33,4 @@ H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 1) - ADD_TRAIT(H, RTRAIT_HEAVYARMOR, TRAIT_GENERIC) \ No newline at end of file + ADD_TRAIT(H, RTRAIT_HEAVYARMOR, TRAIT_GENERIC)