From a9d328e6325157d2631bf50e3853cf14937cf880 Mon Sep 17 00:00:00 2001
From: telavivgamers <tami@tami.org.il>
Date: Wed, 15 Oct 2025 15:26:33 +0300
Subject: [PATCH] Ashtrays can contain ashes and matches (#40926)

---
 Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml   | 3 ++-
 .../Prototypes/Entities/Objects/Specific/Medical/morgue.yml    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
index 9908e2a028..a683849c0f 100644
--- a/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
+++ b/Resources/Prototypes/Entities/Objects/Decoration/ashtray.yml
@@ -49,6 +49,7 @@
       - Burnt
       - Cigarette
       - Cigar
+      - Matchstick
     hideStackVisualsWhenClosed: false
     maxItemSize: Tiny
     grid:
@@ -58,7 +59,7 @@
       storagebase: !type:Container
   - type: ItemCounter
     count:
-      tags: [ Cigarette, Cigar, Burnt ]
+      tags: [ Cigarette, Cigar, Burnt, Matchstick ]
     composite: true
     layerStates:
     - ashtray1
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index 44fab0850c..be6d676e5b 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -123,6 +123,7 @@
     state: ash
   - type: Tag
     tags:
+    - Burnt
     - Trash
   - type: SolutionContainerManager
     solutions: