From bc4c42d09fa63431e8a905c0fb9daf73de77cb35 Mon Sep 17 00:00:00 2001
From: SmArtKar <44720187+SmArtKar@users.noreply.github.com>
Date: Sun, 13 Apr 2025 07:01:50 +0200
Subject: [PATCH] Fixes grilles not updating their overlays properly (#90520)

Caused by grilles weirdly hijacking their rendering code and preventing
any overlay updates which is baaad.
---
 code/game/objects/structures/grille.dm | 42 ++++++++++++++------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index ddfa9884be7..2daac47cbd9 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -40,15 +40,17 @@
 	update_appearance()
 
 /obj/structure/grille/update_appearance(updates)
-	if(QDELETED(src) || broken)
+	if(QDELETED(src))
 		return
-
 	. = ..()
 	if((updates & UPDATE_SMOOTHING) && (smoothing_flags & USES_SMOOTHING))
 		QUEUE_SMOOTH(src)
 
 /obj/structure/grille/update_icon_state()
-	icon_state = "[base_icon_state][((atom_integrity / max_integrity) <= 0.5) ? "50_[rand(0, 3)]" : null]"
+	if (broken)
+		icon_state = "broken[base_icon_state]"
+	else
+		icon_state = "[base_icon_state][((atom_integrity / max_integrity) <= 0.5) ? "50_[rand(0, 3)]" : null]"
 	return ..()
 
 /obj/structure/grille/examine(mob/user)
@@ -298,24 +300,26 @@
 
 /obj/structure/grille/atom_break()
 	. = ..()
-	if(!broken)
-		icon_state = "brokengrille"
-		set_density(FALSE)
-		atom_integrity = 20
-		broken = TRUE
-		rods_amount = 1
-		var/obj/item/dropped_rods = new rods_type(drop_location(), rods_amount)
-		transfer_fingerprints_to(dropped_rods)
+	if(broken)
+		return
+	set_density(FALSE)
+	atom_integrity = 20
+	broken = TRUE
+	rods_amount = 1
+	var/obj/item/dropped_rods = new rods_type(drop_location(), rods_amount)
+	transfer_fingerprints_to(dropped_rods)
+	update_appearance()
 
 /obj/structure/grille/proc/repair_grille()
-	if(broken)
-		icon_state = "grille"
-		set_density(TRUE)
-		atom_integrity = max_integrity
-		broken = FALSE
-		rods_amount = 2
-		return TRUE
-	return FALSE
+	if(!broken)
+		return FALSE
+
+	set_density(TRUE)
+	atom_integrity = max_integrity
+	broken = FALSE
+	rods_amount = 2
+	update_appearance()
+	return TRUE
 
 // shock user with probability prb (if all connections & power are working)
 // returns 1 if shocked, 0 otherwise