diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm
index 53ed38469c..3975adc4e0 100644
--- a/code/__DEFINES/jobs.dm
+++ b/code/__DEFINES/jobs.dm
@@ -104,6 +104,7 @@
 #define ARCHIVIST   (1<<6)
 #define MERCHANT	(1<<7)
 #define FELDSHER    (1<<8)
+#define NIGHTMAN    (1<<9)
 
 #define GARRISON		(1<<1)
 
diff --git a/code/modules/clothing/rogueclothes/armor.dm b/code/modules/clothing/rogueclothes/armor.dm
index 870ae08a50..c8e07f6165 100644
--- a/code/modules/clothing/rogueclothes/armor.dm
+++ b/code/modules/clothing/rogueclothes/armor.dm
@@ -518,8 +518,8 @@
 	desc = "A silken jacket discretely padded with leather on the inside."
 	body_parts_covered = CHEST|VITALS|LEGS
 	sleeved = 'icons/roguetown/clothing/onmob/armor.dmi'
-	allowed_sex = list(MALE)
-	allowed_race = list("human", "tiefling", "aasimar")
+	allowed_sex = list(MALE, FEMALE)
+	allowed_race = list("human", "tiefling","elf", "half-elf", "dark elf", "aasimar")
 	sellprice = 60
 
 
diff --git a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
index 37e2b73bd5..4051a8bf98 100644
--- a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
+++ b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm
@@ -1,7 +1,7 @@
 /datum/job/roguetown/niteman
 	title = "Niteman"
-	flag = JESTER
-	department_flag = PEASANTS
+	flag = NIGHTMAN
+	department_flag = NOBLEMEN
 	faction = "Station"
 	total_positions = 1
 	spawn_positions = 1
@@ -28,16 +28,16 @@
 
 /datum/outfit/job/roguetown/niteman/pre_equip(mob/living/carbon/human/H)
 	..()
+	armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor/niteman
 	shoes = /obj/item/clothing/shoes/roguetown/shortboots
 	belt = /obj/item/storage/belt/rogue/leather/rope
 	beltr = /obj/item/keyring/niteman
-	beltl = /obj/item/rogueweapon/huntingknife
+	beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
 	ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
 	ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
 	if(H.mind)
 		H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) // Need the strongarm to wrestle people out of the baths
 		H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE)	// Don't make me regret these levels.
-		H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE)
 		H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
@@ -58,4 +58,3 @@
 				armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor
 	else
 		pants = /obj/item/clothing/under/roguetown/tights
-		armor = /obj/item/clothing/suit/roguetown/armor/armordress/alt
diff --git a/icons/roguetown/clothing/onmob/armor.dmi b/icons/roguetown/clothing/onmob/armor.dmi
index 4c7f902f9b..ceb8549df0 100644
Binary files a/icons/roguetown/clothing/onmob/armor.dmi and b/icons/roguetown/clothing/onmob/armor.dmi differ