From 159a3c4601d64fbdfb674a67a735fbff844e720e Mon Sep 17 00:00:00 2001
From: BartDrown <40639741+BartDrown@users.noreply.github.com>
Date: Mon, 23 Feb 2026 21:28:46 +0100
Subject: [PATCH] fix: stat panel flickering, stat panel items not
 interactable, disposal unit ui fix

---
 code/controllers/subsystems/statpanel.dm |  2 +-
 code/game/atoms.dm                       |  1 +
 html/statbrowser.html                    | 59 +++++++++++++++++++++---
 3 files changed, 54 insertions(+), 8 deletions(-)

diff --git a/code/controllers/subsystems/statpanel.dm b/code/controllers/subsystems/statpanel.dm
index 12c7b80dfbb..cc60ca3f538 100644
--- a/code/controllers/subsystems/statpanel.dm
+++ b/code/controllers/subsystems/statpanel.dm
@@ -160,7 +160,7 @@ SUBSYSTEM_DEF(statpanels)
 						continue
 					else
 						// This works but we need to figure out caching later
-						turfitems += list(list("[turf_content.name]", "[ma2html(turf_content, target_mob)]"))
+						turfitems += list(list("[turf_content.name]", "\ref[turf_content]", "[ma2html(turf_content, target_mob)]"))
 				turfitems = url_encode(json_encode(turfitems))
 				target << output("[turfitems];", "statbrowser:update_listedturf")
 		if(MC_TICK_CHECK)
diff --git a/code/game/atoms.dm b/code/game/atoms.dm
index e7e792bdfce..9f7040b1b6e 100644
--- a/code/game/atoms.dm
+++ b/code/game/atoms.dm
@@ -942,6 +942,7 @@
 	if(href_list["statpanel_item_click"])
 		var/mouseparams = list2params(paramslist)
 		usr_client.Click(src, loc, null, mouseparams)
+		return TRUE // prevent NanoUI Topic chain (CouldUseTopic/set_machine) from firing
 
 /// Called after we wrench/unwrench this object
 /obj/proc/wrenched_change()
diff --git a/html/statbrowser.html b/html/statbrowser.html
index d2ee1a8d011..f9368145f43 100644
--- a/html/statbrowser.html
+++ b/html/statbrowser.html
@@ -794,25 +794,70 @@
 
 function draw_listedturf() {
 	const statcontentdiv = document.getElementById("statcontent");
-	statcontentdiv.textContent = "";
+	const existingContainer = document.getElementById("turf-container");
+
+	// If the same items are present (by name), only refresh image srcs and refs.
+	// Screen objects from ma2html expire after 5s so refs must be updated each tick,
+	// but clearing the DOM on every tick causes visible flickering.
+	if (existingContainer) {
+		const existingItems = existingContainer.querySelectorAll('.turf-item');
+		if (existingItems.length === turfcontents.length) {
+			let sameStructure = true;
+			for (let i = 0; i < turfcontents.length; i++) {
+				if (existingItems[i].getAttribute('data-turf-name') !== turfcontents[i][0]) {
+					sameStructure = false;
+					break;
+				}
+			}
+			if (sameStructure) {
+				for (let i = 0; i < turfcontents.length; i++) {
+					const ref = turfcontents[i][1];
+					const html = turfcontents[i][2];
+					const item = existingItems[i];
+					item.setAttribute('data-turf-ref', ref);
+					const iconSpan = item.querySelector('.turf-icon');
+					if (iconSpan) {
+						const tmpDiv = document.createElement('div');
+						tmpDiv.innerHTML = html;
+						const newImg = tmpDiv.querySelector('img');
+						const existingImg = iconSpan.querySelector('img');
+						if (newImg && existingImg) {
+							existingImg.src = newImg.src;
+						} else {
+							iconSpan.innerHTML = html;
+						}
+					}
+				}
+				return;
+			}
+		}
+	}
 
+	// Full redraw: item list changed or first render
+	statcontentdiv.textContent = "";
 	const container = document.createElement("div");
+	container.id = "turf-container";
 
 	for (let i = 0; i < turfcontents.length; i++) {
 		const part = turfcontents[i];
-		const [label, html] = part;
+		const label = part[0];
+		const ref = part[1];
+		const html = part[2];
 
 		const b = document.createElement("div");
-		b.className = "link";
-		b.innerHTML = `<div class="turf-entry-label">${label}</div>${html}`;
-		b.onmousedown = (e => {
+		b.className = "link turf-item";
+		b.setAttribute('data-turf-name', label);
+		b.setAttribute('data-turf-ref', ref);
+		b.innerHTML = `<div class="turf-entry-label">${label}</div><span class="turf-icon">${html}</span>`;
+		b.onmousedown = (e) => {
 			e.preventDefault();
-			let clickcatcher = "?src=" + part[1] + ";statpanel_item_click=1";
+			const currentRef = b.getAttribute('data-turf-ref');
+			let clickcatcher = "?src=" + currentRef + ";statpanel_item_click=1";
 			if (e.shiftKey) clickcatcher += ";statpanel_item_shiftclick=1";
 			if (e.ctrlKey) clickcatcher += ";statpanel_item_ctrlclick=1";
 			if (e.altKey) clickcatcher += ";statpanel_item_altclick=1";
 			window.location.href = clickcatcher;
-		});
+		};
 
 		container.appendChild(b);
 	}