Fix overlays - 20 10 23

BeeStation · Oct 20, 2023 · a376b0b · a376b0b
1 parent 0634635
commit a376b0b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 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
@@ -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
@@ -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
@@ -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