diff --git a/Content.Server/Light/Components/MatchstickComponent.cs b/Content.Server/Light/Components/MatchstickComponent.cs
index 65e5762907..a402f0f24b 100644
--- a/Content.Server/Light/Components/MatchstickComponent.cs
+++ b/Content.Server/Light/Components/MatchstickComponent.cs
@@ -12,6 +12,7 @@ namespace Content.Server.Light.Components
         /// Current state to matchstick. Can be <code>Unlit</code>, <code>Lit</code> or <code>Burnt</code>.
         /// </summary>
         [ViewVariables]
+        [DataField("state")]
         public SmokableState CurrentState = SmokableState.Unlit;
 
         /// <summary>
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
index 13569c5754..65e4772bff 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigarettes/cigarette.yml
@@ -24,6 +24,20 @@
     graph: smokeableCigarette
     node: cigarette
 
+- type: entity
+  id: CigaretteSpent
+  parent: Cigarette
+  suffix: spent
+  components:
+  - type: Sprite
+    state: burnt-icon
+  - type: Smokable
+    state: Burnt
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+
 - type: entity
   id: CigaretteSyndicate
   suffix: syndicate
diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
index 4b873c7ca5..23a698206a 100644
--- a/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
+++ b/Resources/Prototypes/Entities/Objects/Consumable/Smokeables/Cigars/cigar.yml
@@ -22,6 +22,20 @@
   - type: Item
     size: 1
 
+- type: entity
+  id: CigarSpent
+  parent: Cigar
+  suffix: spent
+  components:
+  - type: Sprite
+    state: burnt-icon
+  - type: Smokable
+    state: Burnt
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
+
 - type: entity
   id: CigarGold
   parent: Cigar
@@ -38,3 +52,17 @@
     equippedPrefix: unlit
   - type: Item
     size: 1
+
+- type: entity
+  id: CigarGoldSpent
+  parent: CigarGold
+  suffix: spent
+  components:
+  - type: Sprite
+    state: burnt-icon
+  - type: Smokable
+    state: Burnt
+  - type: SolutionContainerManager
+    solutions:
+      smokable:
+        maxVol: 20
diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
index b0d765b087..a96026b9c1 100644
--- a/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
+++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
@@ -80,7 +80,7 @@
   name: body bag
   description: A plastic bag designed for the storage and transportation of cadavers.
   parent: BodyBag_Container
-  suffix: Folded
+  suffix: folded
   components:
   - type: Foldable
     folded: true
diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
index 9f6fd3701f..9350cf4da6 100644
--- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml
+++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml
@@ -44,6 +44,17 @@
         litIcon: match_lit
         burntIcon: match_burnt
 
+- type: entity
+  parent: Matchstick
+  id: MatchstickSpent
+  suffix: spent
+  components:
+  - type: Sprite
+    layers:
+      - state: match_burnt
+  - type: Matchstick
+    state: Burnt
+
 - type: entity
   name: match box
   parent: SmallboxItem
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
index 58c2973256..482dcf64f1 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
@@ -243,3 +243,13 @@
   - type: Construction
     graph: Seat
     node: chairFolding
+
+- type: entity
+  parent: ChairFolding
+  id: ChairFoldingSpawnFolded
+  suffix: folded
+  placement:
+    mode: PlaceFree
+  components:
+  - type: Foldable
+    folded: true
diff --git a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
index ea1edd0654..ea415d31cd 100644
--- a/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
+++ b/Resources/Prototypes/Entities/Structures/Furniture/rollerbeds.yml
@@ -58,6 +58,14 @@
     - type: StaticPrice
       price: 200
 
+- type: entity
+  parent: RollerBed
+  id: RollerBedSpawnFolded
+  suffix: folded
+  components:
+  - type: Foldable
+    folded: true
+
 - type: entity
   id: CheapRollerBed
   name: rollerbed
@@ -75,6 +83,14 @@
     - type: RollerbedVisualizer
       key: cheap_rollerbed
 
+- type: entity
+  parent: CheapRollerBed
+  id: CheapRollerBedSpawnFolded
+  suffix: folded
+  components:
+  - type: Foldable
+    folded: true
+
 - type: entity
   id: EmergencyRollerBed
   name: rollerbed
@@ -91,3 +107,11 @@
       key: emergency_rollerbed
     - type: RollerbedVisualizer
       key: emergency_rollerbed
+
+- type: entity
+  parent: EmergencyRollerBed
+  id: EmergencyRollerBedSpawnFolded
+  suffix: folded
+  components:
+  - type: Foldable
+    folded: true