From 7bd905e6b211039d18498cc3805aca907740e40f Mon Sep 17 00:00:00 2001
From: Ghommie <42542238+Ghommie@users.noreply.github.com>
Date: Sun, 3 Nov 2019 15:13:18 +0100
Subject: [PATCH] Mistakes were made.

---
 code/__HELPERS/game.dm                                 |  4 +++-
 .../mob/living/carbon/human/species_types/dullahan.dm  |  4 +++-
 code/modules/surgery/bodyparts/head.dm                 | 10 ++++------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/code/__HELPERS/game.dm b/code/__HELPERS/game.dm
index 88754d1436..e527b8c357 100644
--- a/code/__HELPERS/game.dm
+++ b/code/__HELPERS/game.dm
@@ -264,7 +264,9 @@
 		var/atom/A = processing_list[1]
 		if(A.flags_1 & HEAR_1)
 			. += A
-			SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing_list, .)
+			var/list/hearers = list()
+			SEND_SIGNAL(A, COMSIG_ATOM_HEARER_IN_VIEW, processing_list, hearers)
+			. += hearers
 		processing_list.Cut(1, 2)
 		processing_list += A.contents
 
diff --git a/code/modules/mob/living/carbon/human/species_types/dullahan.dm b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
index 8d4b69a2ea..53604a3da9 100644
--- a/code/modules/mob/living/carbon/human/species_types/dullahan.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dullahan.dm
@@ -34,7 +34,9 @@
 	if(head)
 		if(pumpkin)//Pumpkinhead!
 			head.animal_origin = 100
-			head.custom_head = image('icons/obj/clothing/hats.dmi', "hardhat1_pumpkin_j")
+			head.icon = 'icons/obj/clothing/hats.dmi'
+			head.icon_state = "hardhat1_pumpkin_j"
+			head.custom_head = TRUE
 		head.drop_limb()
 		if(!QDELETED(head)) //drop_limb() deletes the limb if it's no drop location and dummy humans used for rendering icons are located in nullspace. Do the math.
 			head.throwforce = 25
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index f74fc6e968..a74b1dad28 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -33,7 +33,7 @@
 	var/lip_style = null
 	var/lip_color = "white"
 	//If the head is a special sprite
-	var/image/custom_head
+	var/custom_head
 
 /obj/item/bodypart/head/can_dismember(obj/item/I)
 	if(!((owner.stat == DEAD) || owner.InFullCritical()))
@@ -120,6 +120,8 @@
 	..()
 
 /obj/item/bodypart/head/update_icon_dropped()
+	if(custom_head)
+		return
 	var/list/standing = get_limb_icon(1)
 	if(!standing.len)
 		icon_state = initial(icon_state)//no overlays found, we default back to initial icon.
@@ -131,11 +133,7 @@
 
 /obj/item/bodypart/head/get_limb_icon(dropped)
 	if(custom_head)
-		if(!dropped)
-			custom_head.layer = BODYPARTS_LAYER
-		else
-			custom_head.layer = initial(custom_head.layer)
-		return list(custom_head)
+		return
 	cut_overlays()
 	. = ..()
 	if(dropped) //certain overlays only appear when the limb is being detached from its owner.