The Traitening Pt. 1

code/__DEFINES/traits.dm

@@ -2,31 +2,31 @@
 #define TRAIT_WEBWALK 					"Webwalker"
 #define TRAIT_NOSTINK 					"Dead Nose"
 #define TRAIT_ZJUMP 					"High Jumping"
-#define TRAIT_NOSEGRAB 				"Intimidating"
+#define TRAIT_NOSEGRAB 					"Intimidating"
 #define TRAIT_NUTCRACKER 				"Nutcracker"
-#define TRAIT_SEEPRICES				"Golden Blood"
+#define TRAIT_SEEPRICES					"Golden Blood"
 #define TRAIT_STRONGBITE				"Strong Bite"
-#define TRAIT_HATEWOMEN				"Ladykiller"
-#define TRAIT_GOODLOVER				"Fabled Lover"
-#define TRAIT_SEEDKNOW 				"Seed Knower"
-#define TRAIT_NOBLE					"Noble Blooded"
+#define TRAIT_HATEWOMEN					"Ladykiller"
+#define TRAIT_GOODLOVER					"Fabled Lover"
+#define TRAIT_SEEDKNOW 					"Seed Knower"
+#define TRAIT_NOBLE						"Noble Blooded"
 #define TRAIT_EMPATH					"Empath"
 #define TRAIT_BREADY					"Battleready"
 #define TRAIT_MEDIUMARMOR				"Mail Training"
 #define TRAIT_HEAVYARMOR				"Plate Training"
-#define TRAIT_DODGEEXPERT              "Fast Reflexes"
+#define TRAIT_DODGEEXPERT               "Fast Reflexes"
 #define TRAIT_VILLAIN					"Villain"
 #define TRAIT_CRITICAL_RESISTANCE		"Critical Resistance"
-#define TRAIT_CRITICAL_WEAKNESS		"Critical Weakness"
-#define TRAIT_MANIAC_AWOKEN			"Awoken"
-#define TRAIT_NOROGSTAM				"Indefatigable" //for ai
-#define TRAIT_NOSLEEP				"Nite Creacher" //for thralls
+#define TRAIT_CRITICAL_WEAKNESS			"Critical Weakness"
+#define TRAIT_MANIAC_AWOKEN				"Awoken"
+#define TRAIT_NOROGSTAM					"Indefatigable" //for ai
+#define TRAIT_NOSLEEP					"Nite Creacher" //for thralls
 #define TRAIT_NUDIST					"Nudist" //you can't wear most clothes
 #define TRAIT_KNEESTINGER_IMMUNITY		"Blessing of Dendor"
 #define TRAIT_RETARD_ANATOMY			"Inhumen Anatomy" //can't wear hats and shoes
 #define TRAIT_NASTY_EATER 				"Inhumen Digestion" //can eat rotten food, organs, poison berries, and drink murky water
-#define TRAIT_NOFALLDAMAGE1 		"Minor fall damage immunity"
-#define TRAIT_ROT_EATER				"Blessing of Pestra" //can eat rotten food
+#define TRAIT_NOFALLDAMAGE1 			"Minor fall damage immunity"
+#define TRAIT_ROT_EATER					"Blessing of Pestra" //can eat rotten food
 #define TRAIT_ORGAN_EATER				"Blessing of Graggar"
 #define TRAIT_SOUL_EXAMINE				"Blessing of Necra" //can check bodies to see if they have departed
 #define TRAIT_CYCLOPS_LEFT				"Cyclops (Left)" //poked left eye
@@ -44,6 +44,15 @@
 #define TRAIT_ANTISCRYING				"Anti-Scrying"
 #define TRAIT_SHOCKIMMUNE				"Shock Immunity"
 #define TRAIT_LONGSTRIDER 				"Longstrider"
+#define TRAIT_BEAUTIFUL 				"Beautiful"
+#define TRAIT_LEAPER 					"Leaper"
+#define TRAIT_GOODRUNNER 				"Good Runner"
+#define TRAIT_SWIFTRUNNER 				"Swift Runner"
+#define TRAIT_KICKUP					"Kick-Up"
+#define TRAIT_MARTIALEYE				"Martial Eye"
+#define TRAIT_BLINDFIGHT				"Blindfight"
+#define TRAIT_IRONCOMFORT				"Iron Comfort"
+#define TRAIT_SHIELDEXPERT				"Shield Expert"
 
 #define TRAIT_BASHDOORS "bashdoors"
 #define TRAIT_NOMOOD "no_mood"
@@ -69,6 +78,15 @@ GLOBAL_LIST_INIT(roguetraits, list(
 	TRAIT_NOSTINK = span_dead("My nose is numb to the smell of decay."),
 	TRAIT_ZJUMP = "Time to reach a new high.",
 	TRAIT_NOSEGRAB = "I love to grab idiots by their noses!",
+	TRAIT_LEAPER = "I can leap like a frog.",
+	TRAIT_BEAUTIFUL = span_info("People love looking at my face"),
+	TRAIT_GOODRUNNER = span_info("I can sprint without breaking a sweat!"),
+	TRAIT_SWIFTRUNNER = span_info("I can run gracefully, avoiding collisions."),
+	TRAIT_KICKUP = "I can quickly get back on my feet.",
+	TRAIT_MARTIALEYE = "I can gauge an opponent's speed and exertion at a glance.",
+	TRAIT_BLINDFIGHT = "My senses are sharp. I can react to and parry opponents outside my field of vision.",
+	TRAIT_IRONCOMFORT = "Armor is like a second skin to me. Neither iron nor steel will slow me down.",
+	TRAIT_SHIELDEXPERT = "So long as I have a shield in one hand, I can catch arrows with ease.",
 	TRAIT_NUTCRACKER = "I love kicking idiots on the nuts!",
 	TRAIT_SEEPRICES = "I can tell the prices of things down to the zenny.",
 	TRAIT_STRONGBITE = "Stronger bites, critical bite attacks.",

code/_onclick/other_mobs.dm

@@ -303,13 +303,15 @@
 					return
 				if(src.get_num_legs() < 2)
 					return
+				if(src.IsStun() || src.IsParalyzed())
+					return
 				if(pulledby && pulledby != src)
 					to_chat(src, "<span class='warning'>I'm being grabbed.</span>")
 					return
 				if(IsOffBalanced())
 					to_chat(src, "<span class='warning'>I haven't regained my balance yet.</span>")
 					return
-				if(lying)
+				if(lying && !HAS_TRAIT(src, TRAIT_LEAPER))
 					to_chat(src, "<span class='warning'>I should stand up first.</span>")
 					return
 				if(!ismob(A) && !isturf(A))
@@ -327,14 +329,17 @@
 				var/jrange
 				var/jextra = FALSE
 				if(m_intent == MOVE_INTENT_RUN)
-					OffBalance(30)
 					jadded = 15
 					jrange = 3
-					jextra = TRUE
+					if(!HAS_TRAIT(src, TRAIT_LEAPER))
+						jextra = TRUE
 				else
-					OffBalance(20)
 					jadded = 10
 					jrange = 2
+				if(HAS_TRAIT(src, TRAIT_LEAPER))
+					OffBalance(10)
+				else
+					OffBalance(20)
 				if(ishuman(src))
 					var/mob/living/carbon/human/H = src
 					jadded += H.get_complex_pain()/50

code/datums/status_effects/rogue/debuff.dm

@@ -368,12 +368,11 @@
 /datum/status_effect/debuff/barbfalter
 	id = "barbfalter"
 	alert_type = /atom/movable/screen/alert/status_effect/debuff/barbfalter
-	duration = 30 SECONDS
-	effectedstats = list("strength" = -1, "speed" = -1)
+	effectedstats = list("strength" = -1, "speed" = -3)
 
 /atom/movable/screen/alert/status_effect/debuff/barbfalter
 	name = "Faltering"
-	desc = "<span class='warning'>I've pushed myself to my limit.</span>\n"
+	desc = "<span class='warning'>I've pushed myself to my limit. I must rest to restore my strenght.</span>\n"
 	icon_state = "muscles"
 
 /datum/status_effect/debuff/revive

code/datums/status_effects/rogue/roguebuff.dm

@@ -297,13 +297,23 @@
 /datum/status_effect/buff/barbrage
 	id = "barbrage"
 	alert_type = /atom/movable/screen/alert/status_effect/buff/barbrage
-	effectedstats = list("strength" = 1, "endurance" = 2, "perception" = -2, "intelligence" = -2) //endurance to boost pain treshold, not powerful enough to warrant total painkilling
-	duration = 15 SECONDS
+	effectedstats = list("strength" = 1, "endurance" = 4, "perception" = -2, "intelligence" = -2) //endurance to boost pain treshold, not powerful enough to warrant total painkilling
+	duration = 45 SECONDS
+
+/datum/status_effect/buff/barbrage/nextmove_modifier()
+	return 0.75
 
 /atom/movable/screen/alert/status_effect/buff/barbrage
 	name = "Barbaric Rage"
 	desc = span_nicegreen("WITNESS ME!")
 	icon_state = "ravox"
+
+/datum/status_effect/buff/barbrage/on_apply()
+	. = ..()
+	if(iscarbon(owner))
+		var/mob/living/carbon/C = owner
+		C.rogstam_add(200)
+		C.rogfat_reset()
 
 /datum/status_effect/buff/barbrage/on_remove()
 	. = ..()

code/datums/stress/positive_events.dm

@@ -32,6 +32,11 @@
 	timer = 30 MINUTES
 	stressadd = -2
 	desc = span_green("The Gods smiles upon me.")
+
+/datum/stressevent/beautiful
+	stressadd = -2
+	desc = span_green("Their face is a work of art")
+	timer = 5 MINUTES
 
 /datum/stressevent/cumok
 	timer = 5 MINUTES

code/game/objects/items/rogueitems/natural/stones.dm

@@ -64,7 +64,7 @@
 
 /obj/item/natural/rock/Crossed(mob/living/L)
 	if(istype(L) && !L.throwing)
-		if(L.m_intent == MOVE_INTENT_RUN)
+		if(L.m_intent == MOVE_INTENT_RUN && !HAS_TRAIT(L, TRAIT_SWIFTRUNNER))
 			L.visible_message("<span class='warning'>[L] trips over the rock!</span>","<span class='warning'>I trip over the rock!</span>")
 			L.Knockdown(10)
 			L.consider_ambush()

code/game/objects/items/rogueweapons/shields.dm

@@ -55,6 +55,9 @@
 		if(owner.client?.chargedprog == 100 && owner.used_intent?.tranged)
 			owner.visible_message("<span class='danger'>[owner] blocks [hitby] with [src]!</span>")
 			return 1
+		if(HAS_TRAIT(owner, TRAIT_SHIELDEXPERT))
+			owner.visible_message("<span class='danger'>[owner] deftly blocks [hitby] with [src]!</span>")
+			return 1
 		else
 			if(prob(coverage))
 				owner.visible_message("<span class='danger'>[owner] blocks [hitby] with [src]!</span>")

code/game/objects/structures.dm

@@ -32,7 +32,7 @@
 	if(density)
 		if(ishuman(AM))
 			var/mob/living/carbon/human/H = AM
-			if(H.dir == get_dir(H,src) && H.m_intent == MOVE_INTENT_RUN && !H.lying)
+			if(H.dir == get_dir(H,src) && H.m_intent == MOVE_INTENT_RUN && !H.lying && !HAS_TRAIT(H, TRAIT_SWIFTRUNNER))
 				H.Immobilize(10)
 				H.apply_damage(15, BRUTE, "chest", H.run_armor_check("chest", "melee", damage = 15))
 				H.toggle_rogmove_intent(MOVE_INTENT_WALK, TRUE)

code/game/turfs/closed/_closed.dm

@@ -86,7 +86,7 @@
 	if(density)
 		if(ishuman(AM))
 			var/mob/living/carbon/human/H = AM
-			if(H.dir == get_dir(H,src) && H.m_intent == MOVE_INTENT_RUN && !H.lying)
+			if(H.dir == get_dir(H,src) && H.m_intent == MOVE_INTENT_RUN && !H.lying && !HAS_TRAIT(H, TRAIT_GOODRUNNER))
 				H.Immobilize(10)
 				H.apply_damage(15, BRUTE, "head", H.run_armor_check("head", "melee", damage = 15))
 				H.toggle_rogmove_intent(MOVE_INTENT_WALK, TRUE)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm

@@ -40,3 +40,5 @@
 	H.change_stat("speed", 1)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_GOODRUNNER, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_SWIFTRUNNER, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm

@@ -50,3 +50,4 @@
 
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_SHIELDEXPERT, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm

@@ -47,3 +47,4 @@
 	wrists = /obj/item/clothing/neck/roguetown/psycross/silver/malum_steel
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) // Nothing fazes a longbeard
+	ADD_TRAIT(H, TRAIT_IRONCOMFORT, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm

@@ -61,6 +61,8 @@
 	H.change_stat("endurance", 1)
 	H.change_stat("speed", 1)
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_LONGSTRIDER, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_SWIFTRUNNER, TRAIT_GENERIC) //For running through forested terrain.
 	if(prob(25))
 		if(!H.has_language(/datum/language/elvish))
 			H.grant_language(/datum/language/elvish)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm

@@ -214,6 +214,7 @@
 	ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_VILLAIN, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_SWIFTRUNNER, TRAIT_GENERIC) //For getaways.
 
 	H.change_stat("perception", 2)
 	H.change_stat("speed", 2)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm

@@ -54,3 +54,4 @@
 
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_KICKUP, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm

@@ -62,3 +62,4 @@
 			to_chat(H, "<span class='info'>I can speak Elfish with ,e before my speech.</span>")
 
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_LONGSTRIDER, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm

@@ -50,5 +50,6 @@
 		H.update_body()
 	shirt = pick(/obj/item/clothing/suit/roguetown/shirt/undershirt/sailor, /obj/item/clothing/suit/roguetown/shirt/undershirt/sailor/red)
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_KICKUP, TRAIT_GENERIC) //Yarr.
 	H.change_stat("strength", 1)
 	H.change_stat("speed", 2)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm

@@ -57,3 +57,4 @@
 		ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC)
 		ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
 		ADD_TRAIT(H, TRAIT_GRAVEROBBER, TRAIT_GENERIC)
+		ADD_TRAIT(H, TRAIT_MARTIALEYE, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm

@@ -61,3 +61,4 @@
 	H.verbs |= /mob/living/carbon/human/proc/torture_victim
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)		//If they have torture variables, they shouldn't be effected by stuff.
+	ADD_TRAIT(H, TRAIT_MARTIALEYE, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm

@@ -18,8 +18,8 @@
 /datum/outfit/job/roguetown/adventurer/rogue/pre_equip(mob/living/carbon/human/H)
 	..()
 	shoes = /obj/item/clothing/shoes/roguetown/boots
-	H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE)
-	H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE)
+	H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE)
 	H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE)
@@ -50,6 +50,8 @@
 	backpack_contents = list(/obj/item/lockpick = 1, /obj/item/rogueweapon/knife/dagger/steel)
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC)		//Rogues are known for commonly lacking standard morals, as well as seeing fucked-shit, so - this tracks.
+	ADD_TRAIT(H, TRAIT_KICKUP, TRAIT_GENERIC) //Classic D&D Rogue feature, gets up faster.
+	ADD_TRAIT(H, TRAIT_SWIFTRUNNER, TRAIT_GENERIC)	
 	H.change_stat("strength", -1)
 	H.change_stat("perception", 2)
 	H.change_stat("speed", 2)

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

@@ -87,3 +87,4 @@
 	H.change_stat("constitution", 1)
 	H.change_stat("intelligence", -1) // Muscle brains
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) // MEDIUM armor training only, this is not a rare drifter, they shouldn't have more armor training than a garrison guard
+	ADD_TRAIT(H, TRAIT_BREADY, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm

@@ -18,6 +18,7 @@
 	..()
 	ADD_TRAIT(H, TRAIT_KNEESTINGER_IMMUNITY, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_SEEDKNOW, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_LONGSTRIDER, TRAIT_GENERIC)
 
 	belt = /obj/item/storage/belt/rogue/leather/rope
 	head = /obj/item/clothing/head/roguetown/padded/briarthorns

code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm

@@ -56,6 +56,7 @@
 		else
 			H.change_stat("intelligence", 1)
 			H.change_stat("perception", 3)
+		ADD_TRAIT(H, TRAIT_LONGSTRIDER, TRAIT_GENERIC)
 // Female variant below
 
 /datum/advclass/pilgrim/huntress

code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm

@@ -52,6 +52,8 @@
 		beltr = /obj/item/rogueweapon/knife/dagger/steel/special
 		beltl = /obj/item/quiver/arrows
 		backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1)
+		if(prob(50))
+			ADD_TRAIT(H, TRAIT_BEAUTIFUL, TRAIT_GENERIC)	
 	if(H.gender == MALE)
 		H.change_stat("constitution", 1)
 		H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)

code/modules/jobs/job_types/roguetown/apprentices/prince.dm

@@ -80,3 +80,4 @@
 			H.change_stat("speed", 2)
 	ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_BEAUTIFUL, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/garrison/mayor.dm

@@ -65,4 +65,5 @@
 			H.change_stat("strength", 2)
 			H.change_stat("endurance", 1)
 			H.change_stat("intelligence", 2)
+		ADD_TRAIT(H, TRAIT_LONGSTRIDER, TRAIT_GENERIC)
 	H.verbs |= /mob/proc/haltyell

code/modules/jobs/job_types/roguetown/garrison/royalguard.dm

@@ -88,3 +88,4 @@
 	H.verbs |= /mob/proc/haltyell
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_KNOWBANDITS, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_SHIELDEXPERT, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/garrison/veteran.dm

@@ -74,3 +74,4 @@
 	H.verbs |= /mob/proc/haltyell
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) // Desensitized through thousand campaigns
+	ADD_TRAIT(H, TRAIT_MARTIALEYE, TRAIT_GENERIC)

code/modules/jobs/job_types/roguetown/nobility/captain.dm

@@ -76,4 +76,5 @@
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_KNOWBANDITS, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_MARTIALEYE, TRAIT_GENERIC)
 	H.verbs |= /mob/proc/haltyell

code/modules/jobs/job_types/roguetown/nobility/consort.dm

@@ -85,6 +85,8 @@
 	H.change_stat("fortune", 5)
 	ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
+	if(prob(50))
+		ADD_TRAIT(H, TRAIT_BEAUTIFUL, TRAIT_GENERIC)
 
 /datum/advclass/consort/courtesan
 	name = "Courtesan"
@@ -124,6 +126,7 @@
 	H.change_stat("fortune", 3)
 	ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_BEAUTIFUL, TRAIT_GENERIC)
 
 /datum/advclass/consort/lowborn
 	name = "Lowborn"
@@ -163,3 +166,5 @@
 	H.change_stat("fortune", 1)
 	ADD_TRAIT(H, TRAIT_SEEDKNOW, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
+	if(prob(33))
+		ADD_TRAIT(H, TRAIT_BEAUTIFUL, TRAIT_GENERIC)

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

@@ -65,6 +65,7 @@
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_MARTIALEYE, TRAIT_GENERIC)
 	H.verbs |= /mob/living/carbon/human/proc/torture_victim
 
 /datum/job/roguetown/hand/after_spawn(mob/living/L, mob/M, latejoin = TRUE)

code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm

@@ -47,6 +47,7 @@
 		head = /obj/item/clothing/head/roguetown/helmet/leather/minershelm
 		beltl = /obj/item/rogueweapon/pick/paxe // Dorfs get a pick as their primary weapon and axes/maces to use it
 		backr = /obj/item/rogueweapon/shield/wood
+		ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) //No slowdown from medium armor here.
 	else // No miner's helm for Delves as they haven nitevision now.
 		H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE)

code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm

@@ -27,6 +27,8 @@
 	belt = /obj/item/storage/belt/rogue/leather/rope
 	beltr = /obj/item/roguekey/nitemaiden
 	ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
+	if(prob(33))
+		ADD_TRAIT(H, TRAIT_BEAUTIFUL, TRAIT_GENERIC)
 
 	if(H.mind)
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) // To wrestle people out of the baths

code/modules/jobs/job_types/roguetown/peasants/jester.dm

@@ -66,6 +66,7 @@
 	H.verbs |= /mob/living/carbon/human/proc/ear_trick
 	ADD_TRAIT(H, TRAIT_EMPATH, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NUTCRACKER, TRAIT_GENERIC)
+	ADD_TRAIT(H, TRAIT_LEAPER, TRAIT_GENERIC) //Lower jump CD, can jump while on the floor.
 
 //Ventriloquism! Make things speak!