first-we-burn-away-the-world-that-was

code/controllers/subsystem/fires.dm

@@ -27,11 +27,11 @@ SUBSYSTEM_DEF(fires)
 				return
 			continue
 
-		if(O.burn_state == ON_FIRE)
-			if(O.burn_world_time < world.time)
-				O.burn()
-		else
-			processing -= O
+		if(O.resistance_flags & ON_FIRE) //in case an object is extinguished while still in currentrun
+			if(!(O.resistance_flags & FIRE_PROOF))
+				O.take_damage(20, BURN, "fire", 0)
+			else
+				O.extinguish()
 
 		if(MC_TICK_CHECK)
 			return