diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
index 45649010659..c924ae26801 100644
--- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm
@@ -123,8 +123,12 @@
 /obj/structure/closet/wardrobe/pjs/PopulateContents()
 	new /obj/item/clothing/under/misc/pj/red(src)
 	new /obj/item/clothing/under/misc/pj/red(src)
+	new /obj/item/clothing/head/nightcap/red(src)
+	new /obj/item/clothing/head/nightcap/red(src)
 	new /obj/item/clothing/under/misc/pj/blue(src)
 	new /obj/item/clothing/under/misc/pj/blue(src)
+	new /obj/item/clothing/head/nightcap/blue(src)
+	new /obj/item/clothing/head/nightcap/blue(src)
 	for(var/i in 1 to 4)
 		new /obj/item/clothing/shoes/sneakers/white(src)
 	return
diff --git a/code/modules/clothing/head/hat.dm b/code/modules/clothing/head/hat.dm
index ba574a0d28f..b56e326f6d1 100644
--- a/code/modules/clothing/head/hat.dm
+++ b/code/modules/clothing/head/hat.dm
@@ -47,8 +47,6 @@
 	name = "nurse's hat"
 	desc = "It allows quick identification of trained medical personnel."
 	icon_state = "nursehat"
-
-
 	dog_fashion = /datum/dog_fashion/head/nurse
 
 /obj/item/clothing/head/bowler
@@ -57,7 +55,6 @@
 	icon_state = "bowler"
 	inhand_icon_state = "bowler"
 
-
 /obj/item/clothing/head/bearpelt
 	name = "bear pelt hat"
 	desc = "Fuzzy."
@@ -207,15 +204,14 @@
 	icon_state = "ushankadown"
 	inhand_icon_state = "ushankadown"
 	flags_inv = HIDEEARS|HIDEHAIR
-	var/earflaps = TRUE
 	cold_protection = HEAD
+	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
+	dog_fashion = /datum/dog_fashion/head/ushanka
+	var/earflaps = TRUE
 	///Sprite visible when the ushanka flaps are folded up.
 	var/upsprite = "ushankaup"
 	///Sprite visible when the ushanka flaps are folded down.
 	var/downsprite = "ushankadown"
-	min_cold_protection_temperature = FIRE_HELM_MIN_TEMP_PROTECT
-
-	dog_fashion = /datum/dog_fashion/head/ushanka
 
 /obj/item/clothing/head/ushanka/attack_self(mob/user)
 	if(earflaps)
@@ -227,3 +223,13 @@
 		inhand_icon_state = downsprite
 		to_chat(user, span_notice("You lower the ear flaps on the ushanka."))
 	earflaps = !earflaps
+
+/obj/item/clothing/head/nightcap/blue
+	name = "blue nightcap"
+	desc = "A blue nightcap for all the dreamers and snoozers out there."
+	icon_state = "sleep_blue"
+
+/obj/item/clothing/head/nightcap/red
+	name = "red nightcap"
+	desc = "A red nightcap for all the sleepyheads and dozers out there."
+	icon_state = "sleep_red"
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 5556edbd7ef..e113315f8af 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 0ffc2b7693d..7c40a40f8cd 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ