diff --git a/code/datums/dog_fashion.dm b/code/datums/dog_fashion.dm
index 00424d9544a..f775e4128e6 100644
--- a/code/datums/dog_fashion.dm
+++ b/code/datums/dog_fashion.dm
@@ -179,3 +179,25 @@
 	name = "Festive REAL_NAME"
 	desc = "Ready to party!"
 	obj_icon_state = "festive"
+
+/datum/dog_fashion/head/pumpkin/unlit
+	name = "Headless HoP-less REAL_NAME"
+	desc = "A spooky dog spirit of a beloved pet who lost their owner."
+	obj_icon_state = "pumpkin0"
+	speak = list("BOO!", "AUUUUUUU", "RAAARGH!")
+	emote_see = list("shambles around.", "yaps ominously.", "shivers.")
+	emote_hear = list("howls at the Moon.", "yaps at the crows!")
+
+/datum/dog_fashion/head/pumpkin/lit
+	obj_icon_state = "pumpkin1"
+
+/datum/dog_fashion/head/blumpkin/unlit
+	name = "Hue-less Headless HoP-less REAL_NAME"
+	desc = "An evil dog spirit of a beloved pet that haunts your treats pantries!"
+	obj_icon_state = "blumpkin0"
+	speak = list("BOO!", "AUUUUUUU", "RAAARGH!")
+	emote_see = list("shambles around.", "yaps ominously.", "shivers.")
+	emote_hear = list("howls at the Moon.", "yaps at the crows!", "growls eerily!")
+
+/datum/dog_fashion/head/blumpkin/lit
+	obj_icon_state = "blumpkin1"
diff --git a/code/modules/clothing/head/hardhat.dm b/code/modules/clothing/head/hardhat.dm
index 10fc7309e5c..1cd5707efcb 100644
--- a/code/modules/clothing/head/hardhat.dm
+++ b/code/modules/clothing/head/hardhat.dm
@@ -196,6 +196,7 @@
 	flags_cover = HEADCOVERSEYES
 	light_color = "#fff2bf"
 	worn_y_offset = 1
+	dog_fashion = /datum/dog_fashion/head/pumpkin/unlit
 
 /obj/item/clothing/head/hardhat/pumpkinhead/set_light_on(new_value)
 	. = ..()
@@ -213,6 +214,14 @@
 	if(light_on && !isinhands)
 		. += emissive_appearance(icon_file, "carved_pumpkin-emissive", alpha = src.alpha)
 
+/obj/item/clothing/head/hardhat/pumpkinhead/turn_on(mob/user)
+	. = ..()
+	dog_fashion = /datum/dog_fashion/head/pumpkin/lit
+
+/obj/item/clothing/head/hardhat/pumpkinhead/turn_off(mob/user)
+	. = ..()
+	dog_fashion = /datum/dog_fashion/head/pumpkin/unlit
+
 /obj/item/clothing/head/hardhat/pumpkinhead/blumpkin
 	name = "carved blumpkin"
 	desc = "A very blue jack o' lantern! Believed to ward off vengeful chemists."
@@ -220,6 +229,15 @@
 	inhand_icon_state = "hardhat0_blumpkin"
 	hat_type = "blumpkin"
 	light_color = "#76ff8e"
+	dog_fashion = /datum/dog_fashion/head/blumpkin/unlit
+
+/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin/turn_on(mob/user)
+	. = ..()
+	dog_fashion = /datum/dog_fashion/head/blumpkin/lit
+
+/obj/item/clothing/head/hardhat/pumpkinhead/blumpkin/turn_off(mob/user)
+	. = ..()
+	dog_fashion = /datum/dog_fashion/head/blumpkin/unlit
 
 /obj/item/clothing/head/hardhat/reindeer
 	name = "novelty reindeer hat"
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index ae610259049..fc26e4c8007 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -169,7 +169,7 @@ GLOBAL_LIST_INIT(strippable_corgi_items, create_strippable_list(list(
 
 	corgi_source.place_on_head(equipping, user)
 
-/datum/strippable_item/corgi_head/finish_unequip(atom/source, obj/item/equipping, mob/user)
+/datum/strippable_item/corgi_head/finish_unequip(atom/source, mob/user)
 	var/mob/living/simple_animal/pet/dog/corgi/corgi_source = source
 	if (!istype(corgi_source))
 		return
diff --git a/icons/mob/corgi_head.dmi b/icons/mob/corgi_head.dmi
index 59ce1af198f..d6b97788f75 100644
Binary files a/icons/mob/corgi_head.dmi and b/icons/mob/corgi_head.dmi differ