From 04377481a21b2602e91ea356a63d0875f953fa7e Mon Sep 17 00:00:00 2001
From: S34N <12197162+S34NW@users.noreply.github.com>
Date: Sat, 13 May 2023 23:23:44 +0100
Subject: [PATCH] Holding a plant pot hides mob HUD (#20868)

* hide plant pot

* different method

* GC

* what am I even doing
---
 code/game/objects/structures/flora.dm | 29 +++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 289d7cbb4ae..be9ba9d938d 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -266,23 +266,40 @@
 	throwforce = 13
 	throw_speed = 2
 	throw_range = 4
+	/// Method to track plant overlay on mob for later removal
+	var/mutable_appearance/mob_overlay
 
-/obj/item/twohanded/required/kirbyplants/New()
-	..()
+/obj/item/twohanded/required/kirbyplants/Initialize(mapload)
+	. = ..()
 	icon_state = "plant-[rand(1,35)]"
 	if(prob(1))
 		icon_state = "plant-36"
 
+/obj/item/twohanded/required/kirbyplants/Destroy()
+	if(isliving(loc))
+		unhide_user(loc)
+
+	QDEL_NULL(mob_overlay)
+	return ..()
+
 /obj/item/twohanded/required/kirbyplants/equipped(mob/living/user)
 	. = ..()
 	if(wielded)
-		var/image/I = image(icon, user, icon_state)
-		I.override = TRUE
-		user.add_alt_appearance("sneaking_mission", I, GLOB.player_list)
+		hide_user(user)
+
+/obj/item/twohanded/required/kirbyplants/proc/hide_user(mob/living/user)
+	mob_overlay = mutable_appearance(icon, icon_state, user.layer, user.plane, 255, appearance_flags = RESET_COLOR | RESET_TRANSFORM | RESET_ALPHA | KEEP_APART)
+	user.add_overlay(mob_overlay)
+	user.alpha = 0
+
+/obj/item/twohanded/required/kirbyplants/proc/unhide_user(mob/living/user)
+	user.cut_overlay(mob_overlay)
+	user.alpha = initial(user.alpha)
+	QDEL_NULL(mob_overlay)
 
 /obj/item/twohanded/required/kirbyplants/dropped(mob/living/user)
 	..()
-	user.remove_alt_appearance("sneaking_mission")
+	unhide_user(user)
 
 /obj/item/twohanded/required/kirbyplants/dead
 	name = "\improper RD's potted plant"