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)
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..27c483774a
--- /dev/null
+++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/dwarfwarrior.dm
@@ -0,0 +1,41 @@
+
+/datum/advclass/dwarfwarrior
+	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")
+	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)
diff --git a/roguetown.dme b/roguetown.dme
index 104867bfdc..5a1cf16508 100644
--- a/roguetown.dme
+++ b/roguetown.dme
@@ -2100,6 +2100,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\paladin.dm"
 #include "code\modules\jobs\job_types\roguetown\adventurer\types\combat\donator\vaquero.dm"