diff --git a/code/modules/jobs/job_types/peasants/prisoner.dm b/code/modules/jobs/job_types/peasants/prisoner.dm
index 880721a3661..4d02cbae60e 100644
--- a/code/modules/jobs/job_types/peasants/prisoner.dm
+++ b/code/modules/jobs/job_types/peasants/prisoner.dm
@@ -2,7 +2,7 @@
 	title = "Prisoner"
 	tutorial = "For a crime, or false allegation; as a hostage against another, \
 	or held for ransom: your fate until this day has been ill-starred save its first. \
-	You are of noble birth. Perhaps your story, which none but you recall, \
+	Perhaps your story, which none but you recall, \
 	will move some pity from callous hearts or promises of riches parole your release. \
 	Maybe your old associates conspire now to release you in a daring rescue. \
 	Yet it is far surer that your tears will rust this cursed mask \
@@ -17,10 +17,9 @@
 	banned_leprosy = FALSE
 	bypass_lastclass = TRUE
 
-	allowed_races = RACES_PLAYER_FOREIGNNOBLE
+	allowed_races = RACES_PLAYER_ALL
 
 	outfit = /datum/outfit/prisoner
-	give_bank_account = 173
 
 	cmode_music = 'sound/music/cmode/towner/CombatPrisoner.ogg'
 	can_have_apprentices = FALSE
@@ -28,8 +27,8 @@
 
 	jobstats = list(
 		STATKEY_STR = -1,
-		STATKEY_PER = 2,
-		STATKEY_INT = 2,
+		STATKEY_PER = -1,
+		STATKEY_INT = -1,
 		STATKEY_SPD = -1,
 		STATKEY_CON = -1,
 		STATKEY_END = -1
@@ -38,16 +37,12 @@
 	skills = list(
 		/datum/skill/combat/wrestling = 1,
 		/datum/skill/combat/knives = 1,
-		/datum/skill/combat/swords = 2,
 		/datum/skill/combat/unarmed = 1,
 		/datum/skill/misc/swimming = 2,
 		/datum/skill/misc/athletics = 1,
-		/datum/skill/misc/reading = 2,
 		/datum/skill/misc/climbing = 2,
 		/datum/skill/misc/sneaking = 3,
 		/datum/skill/misc/lockpicking = 2,
-		/datum/skill/misc/riding = 1,
-		/datum/skill/labor/mathematics = 3
 	)
 
 	traits = list(
@@ -57,6 +52,28 @@
 
 /datum/job/prisoner/after_spawn(mob/living/carbon/human/spawned, client/player_client)
 	. = ..()
+	var/prisonertype = "Commoner" //If you're Tiefling, Hollowkin, or Medicator, this is your only option.
+	if(spawned.dna?.species?.id in RACES_PLAYER_FOREIGNNOBLE)
+		prisonertype = browser_input_list(player_client, "What kind of prisoner are you?", "Filthy Criminal", list("Noble", "Commoner"))
+	if(prisonertype == "Noble")
+		SStreasury.create_bank_account(spawned, 173)
+		spawned.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE)
+		spawned.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
+		spawned.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE)
+		spawned.adjust_skillrank(/datum/skill/labor/mathematics, 3, TRUE)
+		spawned.adjust_stat_modifier(STATMOD_JOB, STATKEY_PER, 3)
+		spawned.adjust_stat_modifier(STATMOD_JOB, STATKEY_INT, 3)
+		ADD_TRAIT(spawned, TRAIT_NOBLE_BLOOD, TRAIT_GENERIC)
+	else
+		spawned.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE)
+		spawned.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE)
+		spawned.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE)
+		spawned.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE)
+		spawned.adjust_skillrank(/datum/skill/craft/sewing, 2, TRUE) //so they're slightly better at the three things they can do while incarcerated.
+		spawned.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE)
+		spawned.adjust_skillrank(/datum/skill/labor/fishing, 2, TRUE)
+		spawned.adjust_stat_modifier(STATMOD_JOB, STATKEY_SPD, 2)
+		spawned.adjust_stat_modifier(STATMOD_JOB, STATKEY_END, 2)
 	if(spawned.wear_mask)
 		var/obj/I = spawned.wear_mask
 		spawned.dropItemToGround(spawned.wear_mask, TRUE)