From 49376e0b4282fb38f5d25c7dba080a2ba12d0fe3 Mon Sep 17 00:00:00 2001
From: FabianK3 <21039694+FabianK3@users.noreply.github.com>
Date: Sun, 2 Aug 2026 03:24:03 +0200
Subject: [PATCH] Fix ashtray material persistence (#22974)

# Summary

This PR fixes ashtrays not retaining their material visual.
---
 code/game/objects/items/weapons/material/ashtray.dm         | 1 +
 .../fabiank3-fix-ashtray-material-persistence.yml           | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 html/changelogs/fabiank3-fix-ashtray-material-persistence.yml

diff --git a/code/game/objects/items/weapons/material/ashtray.dm b/code/game/objects/items/weapons/material/ashtray.dm
index 4c95ad585cf..6c13bd01f62 100644
--- a/code/game/objects/items/weapons/material/ashtray.dm
+++ b/code/game/objects/items/weapons/material/ashtray.dm
@@ -30,6 +30,7 @@
 	if(content["material"])
 		set_material(content["material"])
 		max_butts = round(material.hardness/10)
+		update_icon()
 	var/fill_count = content["fill_count"]
 	if(fill_count)
 		if(fill_count > max_butts)
diff --git a/html/changelogs/fabiank3-fix-ashtray-material-persistence.yml b/html/changelogs/fabiank3-fix-ashtray-material-persistence.yml
new file mode 100644
index 00000000000..e4cecb9ef72
--- /dev/null
+++ b/html/changelogs/fabiank3-fix-ashtray-material-persistence.yml
@@ -0,0 +1,6 @@
+author: FabianK3
+
+delete-after: True
+
+changes:
+  - bugfix: "Fixed ashtrays not refreshing their material from saved persistence."