From a376b0b405141367af68535c267e3428aa90f459 Mon Sep 17 00:00:00 2001
From: DrDuckedGoose <Hisphilosophy.comics@gmail.com>
Date: Fri, 20 Oct 2023 23:43:02 +1100
Subject: [PATCH] Fix overlays - 20 10 23

---
 .../carbon/human/species_types/pumpkin_man.dm   |   2 +-
 .../bodyparts/species_parts/misc_bodyparts.dm   |  11 +++++++----
 code/modules/surgery/organs/tongue.dm           |   2 +-
 icons/mob/pumpkin_faces.dmi                     | Bin 388 -> 442 bytes
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/code/modules/mob/living/carbon/human/species_types/pumpkin_man.dm b/code/modules/mob/living/carbon/human/species_types/pumpkin_man.dm
index d72d0d6ca9ba9..d8fe4ed8b6957 100644
--- a/code/modules/mob/living/carbon/human/species_types/pumpkin_man.dm
+++ b/code/modules/mob/living/carbon/human/species_types/pumpkin_man.dm
@@ -66,7 +66,7 @@
 		//Do after for *flourish*
 		if(do_after(_user, 3 SECONDS))
 			//Reset overlays
-			head.carved_state = "face[rand(0, 8)]"
+			head.carved_overlay.icon_state = "face[rand(0, 8)]"
 			M.update_body_parts_head_only()
 			to_chat(_user, "<span class='notice'>You carve a face into [_source].</span>")
 			//Adjust the tongue
diff --git a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
index b43372a4e3ecb..3a718bf70373c 100644
--- a/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/species_parts/misc_bodyparts.dm
@@ -515,13 +515,16 @@
 	is_dimorphic = FALSE
 	should_draw_greyscale = FALSE
 	item_flags = ISCARVABLE
-	///What state is our carved face
-	var/carved_state
+	///Carved overlay
+	var/image/carved_overlay
+
+/obj/item/bodypart/head/pumpkin_man/Initialize(mapload)
+	. = ..()
+	carved_overlay = image('icons/mob/pumpkin_faces.dmi', "blank", -BODY_LAYER)
 
 /obj/item/bodypart/head/pumpkin_man/get_limb_icon(dropped)
 	. = ..()
-	if(carved_state)
-		. += image('icons/mob/pumpkin_faces.dmi', carved_state, -BODY_LAYER)
+	. += carved_overlay
 
 /obj/item/bodypart/chest/pumpkin_man
 	limb_id = "pumpkin_man"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 497c6477f2a06..372da507f6b61 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -375,5 +375,5 @@
 	if((message[1] != "*" || message[1] != "#") && !carved)
 		message = "..."
 		to_chat(owner, "<span class='warning'>Something is covering your mouth!</span>")
-		to_chat(owner, "<span class='notice'>Try carving your mouth open.</span>")
+		to_chat(owner, "<span class='notice'>Try carving your head.</span>")
 	speech_args[SPEECH_MESSAGE] = message
diff --git a/icons/mob/pumpkin_faces.dmi b/icons/mob/pumpkin_faces.dmi
index 7f01d72627bddb27260c992a162a289e86aacc8d..9bda05364f7a35d237294528bd9177fb67b8ef66 100644
GIT binary patch
delta 329
zcmZo+-o@<R8Q|y6%O%Cdz`(%k>ERLtq#pqB0VZZ3nee{d1xRrQ_=LC~IB)<Ye&B$Q
z-o`E<i?JlgFPOpM*^M+HXTn66>Uxe<UZ*_IoOWAb<Px}a&4X9Znfi1X*7%f9-zm6z
z6;RP(PZ!6KjK;UuZG~DCc-j)@UcATj{;;6Vj{lL{7>+AS@}$*wJ*|~;OLAD9Z{)k9
zlx63{=~q|$mcCn7>7?~L?6K5Qw-sUx2maqS14=BtT5v4VYf(V^`I-|VR?=&wuT~z6
zUtY9j`l&#M13RkPH$3V(y!VxPvC$q|`%|2uPZKul*||Pl5X#Qbqx~#Zuitym`gj+u
zohw6r{pr1Cz{?=vn|;mbxZTvrpZ*>%xpy_{@?6iqT{avH1~T8jeES`Fs&=vH8is~C
Z{Vi+wdHkd<F9Z6A!PC{xWt~$(6957@i(~)*

delta 275
zcmdnR+`{bA8Q|y6%O%Cdz`(%k>ERLtqz`~FBQuc95c=l=q}T#{LR=3V0Euf~U$_iN
zF_r}R1v5B2yO9Ruv`uuct}j>_6jt!Hn9-e?p>=uAM|Lmin?R{qo-U3d5v^~p2J$%=
z@UT5FeCRsoK%&f1L79UW%cjU4buu;1Z0ivG|9z2f@=fR6T2n*r1}99pRHrBAGIimB
zT{rY!Ok^r|seCz&p<ly_>yG(+=FMB`lUF8Of41z<KmLaM8SD!WFgsWHxw!4IKQ!li
z`vm4ab8q}xYFQm(q0Upx7(coHw#`1ZLwe`)c5^!<J-RJ-&U4NV-bc!81y@)WE)g;H
T(|*1c=u8GrS3j3^P6<r_dT(m0