From 74b69af79f3bedc0372d335ba00eb5768565002f Mon Sep 17 00:00:00 2001
From: SkyratBot <59378654+SkyratBot@users.noreply.github.com>
Date: Thu, 24 Dec 2020 12:32:16 +0100
Subject: [PATCH] [MIRROR] fixes headpikes (#2301)

* fixed it (#55615)

headspikes don't give you a random head when you deconstruct them (except when maploaded)
also they look like they were supposed to with the head impaled

* fixes headpikes

Co-authored-by: spessbro <51048066+spessbro@users.noreply.github.com>
---
 code/game/objects/structures/headpike.dm | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/code/game/objects/structures/headpike.dm b/code/game/objects/structures/headpike.dm
index df5ce50d5da..54fa1eb49d1 100644
--- a/code/game/objects/structures/headpike.dm
+++ b/code/game/objects/structures/headpike.dm
@@ -19,16 +19,16 @@
 		CheckParts()
 
 /obj/structure/headpike/CheckParts(list/parts_list)
-	..()
-	victim = locate(/obj/item/bodypart/head) in parts_list
+	victim = locate() in parts_list
 	if(!victim) //likely a mapspawned one
 		victim = new(src)
 		victim.real_name = random_unique_name(prob(50))
 	name = "[victim.real_name] on a spear"
-	update_icon()
 	spear = locate(bonespear ? /obj/item/spear/bonespear : /obj/item/spear) in parts_list
 	if(!spear)
 		spear = bonespear ? new/obj/item/spear/bonespear(src) : new/obj/item/spear(src)
+	update_icon()
+	return ..()
 
 /obj/structure/headpike/Destroy()
 	QDEL_NULL(victim)
@@ -60,12 +60,12 @@
 
 /obj/structure/headpike/update_overlays()
 	. = ..()
-	var/obj/item/bodypart/head/H = locate() in contents
-	if(H)
+	if(victim)
 		var/mutable_appearance/MA = new()
-		MA.copy_overlays(H)
+		MA.copy_overlays(victim)
 		MA.pixel_y = 12
-		. += H
+		MA.pixel_x = pixel_x
+		. += victim
 
 /obj/structure/headpike/attack_hand(mob/user)
 	. = ..()